Merge branch 'MAINT_3_4_0' into QA_3_4
commita22c528ad40cc20924ec789ace883d29193f4761
authorMichal Čihař <michal@cihar.com>
Mon, 9 May 2011 05:42:11 +0000 (9 07:42 +0200)
committerMichal Čihař <michal@cihar.com>
Mon, 9 May 2011 05:42:11 +0000 (9 07:42 +0200)
tree82d758a07dc7cb01c7a841db72cf1556b18a7c58
parent9d42dfc1c4afa1e028df7fa45ec3f82c2d7d5396
parent6bd7d18c5dfc76b64cbe6dd37fcda08652098dd7
Merge branch 'MAINT_3_4_0' into QA_3_4