OSDN Git Service

Merge branch 'zh-maqiyuan' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 1 Apr 2012 05:59:08 +0000 (14:59 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 1 Apr 2012 05:59:08 +0000 (14:59 +0900)

Trivial merge