OSDN Git Service

Merge branch 'zh-maqiyuan' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 7 Jul 2013 20:54:53 +0000 (05:54 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 7 Jul 2013 20:54:53 +0000 (05:54 +0900)
commit73343de9284f0ce0fca54d08e257cd0d57202cd3
treea8c9751b0936c21b30ad0b82661ee510dab05bfe
parent5732f2cafd59081b3ebdad197be711d11f2fc009
parent4290bb9c0088e53a792c9b201bc61e809331ba7b
Merge branch 'zh-maqiyuan' into kitagawa_test