Merge pull request #6448 from alalek:merge-2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 25 Apr 2016 16:56:51 +0000 (16:56 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 25 Apr 2016 16:56:51 +0000 (16:56 +0000)
commit6e5e5d87df4212b91839704ff153ec6d8f2549f6
tree3ccab26b2c98ad4e1259da05c5f2433520b0327a
parent5ed4e1b8878d0928ed278381c21ae8b975de8a22
parent67a734ce735f31caf2d419f065ccd971decad16c
Merge pull request #6448 from alalek:merge-2.4