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)
commitae3f0c50f169c3549c4ed28e29d38d3c5c441efb
tree6a8bde7775eb8e3cbb8b134ca93ead35a74a3503
parentdcd3d8179c1cc63530e4346be85effcc122ae67f
parente0db143401ae56f575db3e1c5b9637e601ae1f6f
Merge remote-tracking branch 'remotes/origin/kitagawa_cid' into zh-maqiyuan