OSDN Git Service

Merge branch 'master' into develop
authordhrname <dhrname@users.sourceforge.jp>
Mon, 18 Feb 2013 14:39:43 +0000 (23:39 +0900)
committerdhrname <dhrname@users.sourceforge.jp>
Mon, 18 Feb 2013 14:39:43 +0000 (23:39 +0900)

Trivial merge