From: Jiang Xin Date: Tue, 8 May 2012 08:03:04 +0000 (+0800) Subject: Merge branch 'maint' X-Git-Tag: v1.7.11-rc0~33^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93949627cb18d18f160fc922ace728d215297e6f;p=git.git Merge branch 'maint' No file is changed by this merge. * maint: l10n: Update git.pot (1 new messages) --- 93949627cb18d18f160fc922ace728d215297e6f