Merge pull request #6035 from ogreen:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 30 Jan 2016 08:22:59 +0000 (08:22 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 30 Jan 2016 08:23:00 +0000 (08:23 +0000)
commita4692a0da5367ace9006a0978dd50fb740f53a10
treebbf6bc84e553fbd4219726378eac4c6b26309e52
parent4894aac50dbd560287844d1cba11ff9833e55594
parent1a0282df21d9e393bfc7089d673361dd15b5ecea
Merge pull request #6035 from ogreen:master