From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 28 Apr 2012 15:26:36 +0000 (+0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.11-rc0~77^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fac15bc683b227c0da0114aefd73df3b445f0b62;p=thirdparty%2Fgit.git

Merge branch 'maint'

By Jiang Xin
* maint:
  l10n: Update Simplified Chinese translation
  l10n: Update git.pot (2 new messages)
---

fac15bc683b227c0da0114aefd73df3b445f0b62