OSDN Git Service

Merge branch 'develop'
authoryuki <kimaira7@gmail.com>
Mon, 11 Nov 2013 09:35:21 +0000 (18:35 +0900)
committeryuki <kimaira7@gmail.com>
Mon, 11 Nov 2013 09:35:21 +0000 (18:35 +0900)

Trivial merge