Merge pull request #5904 from GregoryMorse:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 4 Jan 2016 05:30:28 +0000 (05:30 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 4 Jan 2016 05:30:28 +0000 (05:30 +0000)
commitc06eaf83da1b8945e6ba7f8afbd72c3172f99801
tree6dcd8041fbbfcea10f7c18ba2a92d9609f1f2527
parent290b4d61b50a656acb40725696f4ecdd3f007737
parent5427ede6a16e28f47bd69af6ba4377b7db949097
Merge pull request #5904 from GregoryMorse:master