Merge pull request #1945 from apavlenko:2.4_version_update
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 6 Dec 2013 13:56:59 +0000 (17:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 13:56:59 +0000 (17:56 +0400)

Trivial merge