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)
commit1165e3c317b51a3f47afe1a5762b92cac695fe5c
treec6e2c2fff003e481408f99709d865c73a06f7af7
parent466b0d833bca362fa4458afa420b9816aedbce05
parent493a93228f271ea012e1d1f570db101dd85c85e1
Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git

* '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