Merge master branch for tracking l10n updates of next release
authorJiang Xin <worldhello.net@gmail.com>
Sat, 28 Apr 2012 07:54:37 +0000 (15:54 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sat, 28 Apr 2012 07:54:37 +0000 (15:54 +0800)
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.

Trivial merge