OSDN Git Service

Merge branch 'develop'
authoryuki <kimaira7@gmail.com>
Tue, 25 Nov 2014 09:18:34 +0000 (18:18 +0900)
committeryuki <kimaira7@gmail.com>
Tue, 25 Nov 2014 09:18:34 +0000 (18:18 +0900)

Trivial merge