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)
commit1a139ec449b922a03f1e6608380bdea12aa532b0
tree348d00aa67764ba6e4dbc4b1ef0b19ed1847165a
parentf099cfdf34e8ba935b4eb0482a7d798932c39d2a
parent26319d93b104d5743794813c33e52c77e602998a
Merge remote-tracking branch 'remotes/origin/kitagawa_test' into zh-maqiyuan