OSDN Git Service

Merge branch 'develop' version0.5.2
authoryuki <kimaira7@gmail.com>
Thu, 23 Oct 2014 05:45:32 +0000 (14:45 +0900)
committeryuki <kimaira7@gmail.com>
Thu, 23 Oct 2014 05:45:32 +0000 (14:45 +0900)

Trivial merge