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)

Trivial merge