Merge branch 'branch1'
authorDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:10:45 +0000 (12:10 +0400)
committerDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:10:45 +0000 (12:10 +0400)
commitf66ac31d62824a5b1393ca1e479d5cd3987ac161
treede55bbb233a6686fec2dc9aaedf157b29f12f8c4
parent70bb857c7e0c60dbbd240c4f9ff44f91773fef43
parentcfd80152bb1206123b9c7a8f0b498cc00bb65d55
Merge branch 'branch1'