Merge pull request #9848 from jet47:features2d-optional-flann-dep
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 16 Oct 2017 10:45:16 +0000 (10:45 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 16 Oct 2017 10:45:16 +0000 (10:45 +0000)

Trivial merge