Merge branch 'MAINT_4_2_13' into QA_4_2
commitc2ad99da2bf166de7e114e1e129ee435c9e23756
authorMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 09:21:17 +0000 (4 10:21 +0100)
committerMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 09:21:17 +0000 (4 10:21 +0100)
treecbe9519219a06f67af30cce60eff318767d4a3d1
parent053cd7303131fa09c164b0ff84bb9bd59f087118
parent7a41a4f325264b04fd11e28f975e0199cb5e95d2
Merge branch 'MAINT_4_2_13' into QA_4_2