Merge branch 'maint'

No file is changed by this merge. * maint: l10n: Update git.pot (1 new messages)

Jiang Xin committed May 8, 2012 at 16:03 UTC 93949627cb18d18f160fc922ace728d215297e6f

No changes.