Merge commit '24be7b26c' into merge-2.4 (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:38:52 +0000 (16:38 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:38:52 +0000 (16:38 +0400)
commitce7a2f7edc024d18b02e51e639542b4d6f01765f
treeeeb0db47b85857677c0cf21de903fdc5bf2f68ee
parent0e552ea6e2719ad26cd4d51cae929017b3b8bc6f
parent24be7b26cdf2f90be1ce12117f8ca99ffd2653e7
Merge commit '24be7b26c' into merge-2.4 (-s ours)