Merge commit '83cdd43a' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)
commit9b7e77ccda7a3d9ab532f9a0c7a62a2c2e9d3896
treed801f2ffcee6c28dc830a326af5b5232eee1b8ac
parent8c589438d1ae24a8fc0987d7205c73cd6e03c046
parent83cdd43a4ca75d7a86992d2962c6677629d736e1
Merge commit '83cdd43a' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/version.hpp