Merge pull request #6311 from peters:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)
commitee123b8a9e7724cd648f519bbc6e73f5f968aea3
tree0549a71adabe76f6b819c6add53646b960f4b29e
parent05384f05cc0301c699da9af8c5720db9c1cb2fc6
parent278747ba458c9097aa72bf664c7a8df96d3a56fa
Merge pull request #6311 from peters:master