Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 3 Aug 2012 12:14:38 +0000 (16:14 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Fri, 3 Aug 2012 12:14:38 +0000 (16:14 +0400)
commitfd9069422a4d7739c59d76264d63c75cf31fd878
tree5419e76f9fb56f2767bcbbb7fe6fc88e1446e9a5
parentfac3d9994c8cb8308ac2919a459abae349ed2f7e
parent687d7639a8c4e828825f0c75f990055322ace6b0
Merge remote-tracking branch 'origin/master'