Merge pull request #6266 from gongzg:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 15 Mar 2016 12:51:20 +0000 (12:51 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 15 Mar 2016 12:51:20 +0000 (12:51 +0000)
commit97d8ca3464f2cc941c53447b766c9890e6af8009
tree0017a08b4bf84dbc30338ad14c7e971c1e8624e5
parent947307baaeb38ce071540869f3c11ab12e99dea1
parent0b08d2559eaf2a6d3d7370a9aea26df0536c3b2a
Merge pull request #6266 from gongzg:master