OSDN Git Service

Merge branch 'zh-maqiyuan' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Fri, 27 Apr 2012 03:37:23 +0000 (12:37 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Fri, 27 Apr 2012 03:37:23 +0000 (12:37 +0900)

Trivial merge