OSDN Git Service

Merge branch 'dev' into gh_master
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Sun, 6 Nov 2011 21:13:52 +0000 (23:13 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Sun, 6 Nov 2011 21:13:52 +0000 (23:13 +0200)
commit8170da06a6eb55bfe02fa9e3541b89e5a44ae4a4
tree5f55847f16f7b4adc23c6f81585bb9c9bef8769e
parent121f6d04faedad570e6ce1d8d7e235b55c2a9048
parente29a25662dac63c2f1ef0041eeb7b6fd24d3896e
Merge branch 'dev' into gh_master