OSDN Git Service

Merge remote-tracking branch 'origin/develop' into develop
authoryuki <kimaira7@gmail.com>
Fri, 10 May 2013 10:43:08 +0000 (19:43 +0900)
committeryuki <kimaira7@gmail.com>
Fri, 10 May 2013 10:43:08 +0000 (19:43 +0900)

Trivial merge