Merge branch 'MAINT_4_3_0' into QA_4_3
commit07c4e4cae4644eb342225b2d9a97c7d160c1496e
authorMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 12:18:38 +0000 (4 13:18 +0100)
committerMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 12:18:38 +0000 (4 13:18 +0100)
treec23cf56365227b39ec09208bfed064d7c85cf3b9
parenta649ebadc246e2b128087010ee533affa7ff1e09
parentdc81ab1b3b08b1b67a17f6a96a2a93901fe9ac89
Merge branch 'MAINT_4_3_0' into QA_4_3