Merge commit 'edce617a5' into merge-2.4 (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:37:26 +0000 (16:37 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:37:26 +0000 (16:37 +0400)

Trivial merge