From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 28 Apr 2012 12:30:50 +0000 (+0800)
Subject: Merge maint branch for tracking l10n updates of git stable version
X-Git-Tag: v1.7.10.1~7^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860;p=git.git

Merge maint branch for tracking l10n updates of git stable version

Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
---

b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860