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)
commit2de4ad059834effedb27c78ab0c15f47922013b1
treed801f2ffcee6c28dc830a326af5b5232eee1b8ac
parent9b7e77ccda7a3d9ab532f9a0c7a62a2c2e9d3896
parentedce617a58574abd4fee98e1d324aca029ab3e99
Merge commit 'edce617a5' into merge-2.4 (-s ours)