OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 13 May 2015 13:20:48 +0000 (22:20 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 13 May 2015 13:20:48 +0000 (22:20 +0900)

Trivial merge