Merge commit 'f22d9a23' into merge-2.4 (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)
commit8c589438d1ae24a8fc0987d7205c73cd6e03c046
tree7cbce07d0402a1794e2c5096530d006010e49cd2
parent4a6c2ce3788cc142363733f6a772e4b4c76aedc9
parentf22d9a232dfa84c12533945d7eaa71eafce86bf0
Merge commit 'f22d9a23' into merge-2.4 (-s ours)