Merge pull request #3353 from Chuanbo-Weng:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 28 Oct 2014 10:23:18 +0000 (10:23 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 28 Oct 2014 10:23:18 +0000 (10:23 +0000)
commitfae2eb8a1a28f4e20d438eb6942cd34f8a6123e0
treea80b8b67f2f2d79c6827ebb8faf8d20dee2777fe
parent30222c7be88ff6dfa1219623c6762e43a313b301
parent2b52bb092aabdbeb8c49ac0db1227c93558b30a9
Merge pull request #3353 from Chuanbo-Weng:master