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)
commit42f726e79e2957ec2d040b24362be1881fe3ef06
treedf6283990d3e9c661d3c7e7be81f1306e13ed5ef
parent89a59b773576447c0be8b57eb3aa5155df8d8f21
parentba657ee0068d848ca04674dad2ba3937fbf5b172
Merge branch 'zh-maqiyuan' into kitagawa_test