Merge commit '709e8e8e0' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:48:30 +0000 (16:48 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:48:30 +0000 (16:48 +0400)
commitd61150984242938ca836f3a0ea129d946bfc58ec
tree7ef4375bb76513d47daa327a06a3aa4f14df09b6
parent09e154d2140d332c63214bf049000233a2516976
parent709e8e8e079a707b6ddb5ff32ad58ba0024634ea
Merge commit '709e8e8e0' into merge-2.4