Merge pull request #3151 from PhilLab:orbNoKeypoints
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 17:10:45 +0000 (17:10 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 17:10:45 +0000 (17:10 +0000)

Trivial merge