OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 21 Feb 2017 22:36:40 +0000 (07:36 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 21 Feb 2017 22:36:40 +0000 (07:36 +0900)

Trivial merge