From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 10 Sep 2015 15:14:16 +0000 (+0800)
Subject: Merge branch 'master' of github.com:jiangxin/git
X-Git-Tag: v2.6.0-rc3~3^2~7^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/61d93a2aabc72f4d0331d3787d1c53c91d3ef08b

Merge branch 'master' of github.com:jiangxin/git

* 'master' of github.com:jiangxin/git:
l10n: zh_CN: for git v2.6.0 l10n round 1
l10n: zh_CN: Update Git Glossary: "commit message"
l10n: zh_CN: Update Git Glossary: pickaxe
l10n: zh_CN: Update Git Glossary: fork
l10n: zh_CN: Update Git Glossary: tag
l10n: zh_CN: Update Git Glossary: "dumb", "smart"
l10n: zh_CN: Update Git Glossary: SHA-1
l10n: zh_CN: Add Surrounding Spaces
l10n: zh_CN: Add translations for Git glossary
l10n: TEAMS: stash inactive zh_CN team members
l10n: zh_CN: Update Translation of "tag"
l10n: zh_CN: Unify Translation of "packfile"
l10n: zh_CN: Update Translation: "tag object"
---

61d93a2aabc72f4d0331d3787d1c53c91d3ef08b