Merge branch 'maint'
authorJiang Xin <redacted>
Mon, 14 May 2012 22:40:08 +0000 (06:40 +0800)
committerJiang Xin <redacted>
Mon, 14 May 2012 22:40:08 +0000 (06:40 +0800)
* maint:
  l10n: Update git.pot (3 new, 2 removed messages)


Trivial merge
git clone https://git.99rst.org/PROJECT