Merge branch '2.4.12.x-prep' into 2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Apr 2016 13:26:12 +0000 (16:26 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Apr 2016 13:26:12 +0000 (16:26 +0300)
commitec2ff7f0c0b4ac21463354328eda1a0c78bd35dc
tree225f2caac63f3b319a5ea6939a4d77ff993e6b4c
parent5d038686b165a145b1cf87839a5a7ab8aa3a5d82
parent8e40becab12c642e7bbafb9fe87698e8b6bf28da
Merge branch '2.4.12.x-prep' into 2.4