Merge pull request #3017 from f-morozov:akaze
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 30 Jul 2014 15:03:47 +0000 (15:03 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 30 Jul 2014 15:03:47 +0000 (15:03 +0000)

Trivial merge