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)

Trivial merge