Merge pull request #5992 from ejoebstl:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Jan 2016 16:31:40 +0000 (16:31 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Jan 2016 16:31:41 +0000 (16:31 +0000)
commit5c8907c0e15f315d9de5af3916ad3353d6f7e320
tree9485bdc322d5a760f904c7415ade3aad1e19866a
parent347ffbb0eb340f2d10da37bbdbd89c5e11042cf9
parentb6c5936704bc663d253f665d7b95481528547f85
Merge pull request #5992 from ejoebstl:master