Merge pull request #6882 from ilya-lavrenov:flann
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 12 Jul 2016 10:49:17 +0000 (10:49 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 12 Jul 2016 10:49:17 +0000 (10:49 +0000)

Trivial merge