OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 14 Jan 2014 02:00:24 +0000 (11:00 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 14 Jan 2014 02:00:24 +0000 (11:00 +0900)

Trivial merge