OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 12 May 2015 23:12:46 +0000 (08:12 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 12 May 2015 23:12:46 +0000 (08:12 +0900)

Trivial merge