OSDN Git Service

Merge commit '7097a24fea6fe8055c38d9014aecea99d15696cc' into develop
authorくまかみ工房 <kumakamikoubou@gmail.com>
Tue, 29 Nov 2016 07:56:23 +0000 (16:56 +0900)
committerくまかみ工房 <kumakamikoubou@gmail.com>
Tue, 29 Nov 2016 07:56:23 +0000 (16:56 +0900)

Trivial merge