Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
authorPierre-Emmanuel Viel <p.emmanuel.viel@gmail.com>
Tue, 20 May 2014 23:31:52 +0000 (01:31 +0200)
committerPierre-Emmanuel Viel <p.emmanuel.viel@gmail.com>
Tue, 20 May 2014 23:31:52 +0000 (01:31 +0200)

Trivial merge