Merge branch 'maint'

No file is changed by this merge.

* maint:
  l10n: Update git.pot (1 new messages)
maint
Jiang Xin 2012-05-08 16:03:04 +08:00
commit 93949627cb

Diff Content Not Available