From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 28 Apr 2012 07:54:37 +0000 (+0800)
Subject: Merge master branch for tracking l10n updates of next release
X-Git-Tag: v1.7.11-rc0~77^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69c835701b507e336fd5354f9f3b05e42d20c07d;p=git.git

Merge master branch for tracking l10n updates of next release

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

69c835701b507e336fd5354f9f3b05e42d20c07d