Merge branch 'maint'
commitd81c7d1f84bed577c96aafc75700cf164152ad55
authorJiang Xin <worldhello.net@gmail.com>
Mon, 14 May 2012 22:40:08 +0000 (15 06:40 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Mon, 14 May 2012 22:40:08 +0000 (15 06:40 +0800)
tree6f45364373e534896c300fce541e8f1d64be1e5e
parent6a4a4822298866ec3386a46d9d8f933b80e3a359
parentb741611c062db33dcd2ab41ec589cb659c465ebc
Merge branch 'maint'

* maint:
  l10n: Update git.pot (3 new, 2 removed messages)