OSDN Git Service

Merge branch 'dev'
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:32:56 +0000 (20:32 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:32:56 +0000 (20:32 +0200)
commitfd7de95bce9bb9b1e728f56d550660b85085f219
tree30f025d9f6ffdca3514c4be630b3c4e8032e475f
parent982ba4561a0350737d66bc29dc08201c55da62a9
parent30e34171b605d330a23f37f1862266020d1b132a
Merge branch 'dev'