Merge branch 'QA_3_4'
commit584f75fca8adca4dabcffd199980b9dd7b55019b
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 13:53:21 +0000 (26 14:53 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 13:53:21 +0000 (26 14:53 +0100)
tree46b10d855b735351f2cc4df34928ec4aefa3f665
parent9e987feb4fc586b1f7d531087ea761de955be86e
parent9ea69bd18ef73f761624d3daa2824e3a6cd1c8cc
Merge branch 'QA_3_4'