From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 12 May 2012 07:01:22 +0000 (+0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.11-rc0~33^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b652ada42a76548569a0dc9c9cf356343f9e1c3a;p=git.git

Merge branch 'maint'

* maint:
  l10n: zh_CN.po: translate 1 new message

Conflicts:
	po/zh_CN.po

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

b652ada42a76548569a0dc9c9cf356343f9e1c3a