Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history 
* maint:
  l10n: zh_CN.po: translate 1 new message

Conflicts:
	po/zh_CN.po

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
  • Loading branch information
Jiang Xin committed May 12, 2012
2 parents 1a8e08c + 2f64542 commit b652ada
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b652ada

Please sign in to comment.