Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git
authorJiang Xin <worldhello.net@gmail.com>
Tue, 24 Oct 2017 02:11:48 +0000 (10:11 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Tue, 24 Oct 2017 02:11:48 +0000 (10:11 +0800)
* 'jx/zh_CN-proposed' of github.com:jiangxin/git:
l10n: zh_CN: review for git v2.15.0 l10n round 2
l10n: zh_CN: for git v2.15.0 l10n round 2

Trivial merge