OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Mon, 20 Feb 2017 00:24:58 +0000 (09:24 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Mon, 20 Feb 2017 00:24:58 +0000 (09:24 +0900)

Trivial merge