From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 5 Sep 2015 01:23:31 +0000 (+0800)
Subject: Merge branch 'master' of github.com:jiangxin/git into master
X-Git-Tag: v2.6.0-rc3~3^2~7^2~2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9049ba7c0f92f3e18bb6fb2548d21eb3f0e85f4c;p=thirdparty%2Fgit.git

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

* 'master' of github.com:jiangxin/git:
  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"

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---

9049ba7c0f92f3e18bb6fb2548d21eb3f0e85f4c