OSDN Git Service

Merge remote-tracking branch 'remotes/origin/kitagawa_cid' into zh-maqiyuan
authormaqiyuan <1113706230@qq.com>
Thu, 8 Mar 2012 15:55:46 +0000 (23:55 +0800)
committermaqiyuan <1113706230@qq.com>
Thu, 8 Mar 2012 15:55:46 +0000 (23:55 +0800)

Trivial merge