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)
commit99da73283961e62cea8c663d7153534f0dab6a2d
treef2d4067cc6a65a10d8089b14df30e925a9bd1cb0
parent183fc2b3992eb53a8e7a76f1d11503e60f221449
parent95465c7337af05d04a015391ba5dd988f6e91d2a
Merge branch 'master' into kitagawa_test