OSDN Git Service

Merge branch 'master' into stable
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Fri, 21 Sep 2012 12:47:07 +0000 (15:47 +0300)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Fri, 21 Sep 2012 12:47:07 +0000 (15:47 +0300)

Trivial merge