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)
commita1975ec0c7fc612eca83b48b90906d5eb78096f7
treeb93ee98698ee1476e4e7e26219a4916953937de5
parent9ea8f9cbe5824b0642cd6f3a74a31cf81af96ed4
parent79fd1093ca264092fc215690185ed7816698c897
Merge branch 'master' into kitagawa_test