Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:16:48 +0000 (14:16 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 10:16:48 +0000 (14:16 +0400)
commit013e9294f6ecc280bea293e2a2251f3f25df6d73
tree2903c9978d039a7ebc079e6674c1cdd7ae88f5b2
parent0734d9b877e906bf0e68c1a6c126e84afe43a9f6
parent11dfceb2c9b56ca9c6694eff665e6501b2f6344d
Merge branch '2.4'