OSDN Git Service

Merge remote-tracking branch 'remotes/origin/kitagawa_test' into zh-maqiyuan
authormaqiyuan <1113706230@qq.com>
Sat, 28 Apr 2012 12:44:01 +0000 (20:44 +0800)
committermaqiyuan <1113706230@qq.com>
Sat, 28 Apr 2012 12:44:01 +0000 (20:44 +0800)

Trivial merge