Merge pull request #5968 from alalek:fix_5967
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Jan 2016 13:18:38 +0000 (13:18 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Jan 2016 13:18:38 +0000 (13:18 +0000)
commitc3ad8af42a85a3d03c6dd5727c8b5f4f7585d1d2
tree541624546d6e304be75ee3a128664b312921cafe
parentcb0b2bd1afa8317015030cb71a3084057f1ce932
parentc7ccde69a828c493d0cb291d5151c0cc493a29f1
Merge pull request #5968 from alalek:fix_5967