Merge branch 'master' of https://github.com/Nuzhny007/opencv
authorСергей Нужный <snuzhny@stc-spb.ru>
Wed, 8 Apr 2015 09:44:46 +0000 (12:44 +0300)
committerСергей Нужный <snuzhny@stc-spb.ru>
Wed, 8 Apr 2015 09:44:46 +0000 (12:44 +0300)

Trivial merge