OSDN Git Service

Merge branch 'master' into dev
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:30:34 +0000 (20:30 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:30:34 +0000 (20:30 +0200)
commit30e34171b605d330a23f37f1862266020d1b132a
treeea618a5c0cc1e5c5882d735f5744368f78904a6b
parent3f70316c5f264948d74eb9080079be4c78f5aaa9
parentfe1433c37907e9f1ee3c538d9d8cd79754541684
Merge branch 'master' into dev