OSDN Git Service

Merge remote-tracking branch 'remotes/NAS/develop'
authorくまかみ工房 <kumakamikoubou@gmail.com>
Sat, 22 Oct 2016 16:09:15 +0000 (01:09 +0900)
committerくまかみ工房 <kumakamikoubou@gmail.com>
Sat, 22 Oct 2016 16:09:15 +0000 (01:09 +0900)

Trivial merge