Merge remote-tracking branch 'origin/2.4-flann-lsh-addable-index' into 2.4-flann...
authorippei ito <github@mysrv.link>
Fri, 27 Mar 2015 11:55:59 +0000 (20:55 +0900)
committerippei ito <github@mysrv.link>
Fri, 27 Mar 2015 11:55:59 +0000 (20:55 +0900)

Trivial merge