# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1337117521 -7200
# Node ID a3fc1b09d7159e8f7041028737b6b92807933dea
# Parent  c9dc3cd9ce14a33c411400c0f0e38dee778fc7de# Parent  3dbe675b43422f6115283e96e29c884657b0d1be
merge with beta

diff -r c9dc3cd9ce14 -r a3fc1b09d715 CONTRIBUTORS
--- a/CONTRIBUTORS	Tue May 15 23:27:52 2012 +0200
+++ b/CONTRIBUTORS	Tue May 15 23:32:01 2012 +0200
@@ -3,10 +3,10 @@
     Lukasz Balcerzak <lukaszbalcerzak@gmail.com>
     Jason Harris <jason@jasonfharris.com>
     Thayne Harbaugh  <thayne@fusionio.com>
-    cejones
+    cejones <>
     Thomas Waldmann <tw-public@gmx.de>
     Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
-    Dmitri Kuznetsov
+    Dmitri Kuznetsov <>
     Jared Bunting <jared.bunting@peachjean.com>
     Steve Romanow <slestak989@gmail.com>
     Augosto Hermann <augusto.herrmann@planejamento.gov.br>    
@@ -17,4 +17,5 @@
     Matt Zuba <matt.zuba@goodwillaz.org>
     Aras Pranckevicius <aras@unity3d.com>
     Tony Bussieres <t.bussieres@gmail.com>
-    Erwin Kroon <e.kroon@smartmetersolutions.nl>
\ No newline at end of file
+    Erwin Kroon <e.kroon@smartmetersolutions.nl>
+    nansenat16 <nansenat16@null.tw>
\ No newline at end of file
diff -r c9dc3cd9ce14 -r a3fc1b09d715 docs/changelog.rst
--- a/docs/changelog.rst	Tue May 15 23:27:52 2012 +0200
+++ b/docs/changelog.rst	Tue May 15 23:32:01 2012 +0200
@@ -10,6 +10,7 @@
 news
 ++++
 
+- chinese traditional translation
 
 fixes
 +++++