Merge branch 'MAINT_4_2_13' into QA_4_2
commit053cd7303131fa09c164b0ff84bb9bd59f087118
authorMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 09:12:35 +0000 (4 10:12 +0100)
committerMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 09:12:35 +0000 (4 10:12 +0100)
treea61e51cc091140206dad1d7820bf597f9bf83d37
parent88cd689346757daf2e65c3344a8bf3df359b1225
parentd7b0f0d4f9e0ac78a3a83aeee7cbf91c389d275d
Merge branch 'MAINT_4_2_13' into QA_4_2