Merge pull request #3078 from vpisarev:refactor_features2d_take3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 12 Aug 2014 13:56:17 +0000 (13:56 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 12 Aug 2014 13:56:17 +0000 (13:56 +0000)

Trivial merge