OSDN Git Service

Merge branch 'zh-maqiyuan' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Thu, 3 May 2012 00:14:52 +0000 (09:14 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Thu, 3 May 2012 00:14:52 +0000 (09:14 +0900)

Trivial merge