Merge commit '46be47cb4b8' into merge-2.4 (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:52:16 +0000 (16:52 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:52:16 +0000 (16:52 +0400)
commite33759b358a113ad97dd89779cd3c2bed7e29465
tree975f8fff8a6e2cc156a72c393991e3c5b87801c6
parent1312eca220430cfbc9d6f1aa7f0e472fc5b84974
parent46be47cb4b8ad6a86b00d18ee450c28ef7483a1a
Merge commit '46be47cb4b8' into merge-2.4 (-s ours)