OSDN Git Service

Merge branch 'master' into kitagawa_jfm_kanjiskip
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 22 Sep 2015 10:56:56 +0000 (19:56 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 22 Sep 2015 10:56:56 +0000 (19:56 +0900)

Trivial merge