OSDN Git Service

Merge branch 'dev'
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 16:47:53 +0000 (18:47 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 16:47:53 +0000 (18:47 +0200)
commit260ef03c188cb4ecb53782976e97001711b487b7
tree30f025d9f6ffdca3514c4be630b3c4e8032e475f
parentfaa87e61bf87f1dcff1222573af0ac45679e4777
parent3f70316c5f264948d74eb9080079be4c78f5aaa9
Merge branch 'dev'