From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon, 30 Dec 2013 12:36:35 +0000 (+0400)
Subject: Merge commit '83cdd43a' into merge-2.4
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~748^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b7e77ccda7a3d9ab532f9a0c7a62a2c2e9d3896;p=profile%2Fivi%2Fopencv.git

Merge commit '83cdd43a' into merge-2.4

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

9b7e77ccda7a3d9ab532f9a0c7a62a2c2e9d3896