Merge pull request #5396 from alalek:pr_5377_squashed
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 24 Sep 2015 12:33:42 +0000 (12:33 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 24 Sep 2015 12:33:42 +0000 (12:33 +0000)
commit9633e2c93e33b66f8a4ea72c5cac514da274471e
tree502dabf099631194c8cfbded9eed48702883ac99
parentacec99876d4d5948fe2fea6a3f16ee88fd5b99e3
parentdb78de9c3b16a5da001803562e03de47f6a62922
Merge pull request #5396 from alalek:pr_5377_squashed