Merge branch 'maint'
authorJiang Xin <worldhello.net@gmail.com>
Sat, 28 Apr 2012 15:26:36 +0000 (23:26 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sat, 28 Apr 2012 15:26:36 +0000 (23:26 +0800)
commitfac15bc683b227c0da0114aefd73df3b445f0b62
tree2da82f80efd990b651ddf42730fbb1fd0f697647
parentcd1e74874049c8ba8e510f2fae064e510cccd32b
parent73a60cd252a417a14092791ad0ff33aa6f62f616
Merge branch 'maint'

By Jiang Xin
* maint:
  l10n: Update Simplified Chinese translation
  l10n: Update git.pot (2 new messages)