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)
commit93949627cb18d18f160fc922ace728d215297e6f
tree8038bed854d090cbd1a862c7d17fd11949e52df2
parenta3935e6791c619a9f2f472e9e553d45d88c4e263
parent7795e424c6e61e6458b700b70a4b231c6cec297d
Merge branch 'maint'

No file is changed by this merge.

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