Merge branch 'maint'
authorJiang Xin <worldhello.net@gmail.com>
Tue, 8 May 2012 08:03:04 +0000 (16:03 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Tue, 8 May 2012 08:03:04 +0000 (16:03 +0800)
No file is changed by this merge.

* maint:
  l10n: Update git.pot (1 new messages)


Trivial merge