# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2012-05-15 21:32:01
# Node ID a3fc1b09d7159e8f7041028737b6b92807933dea
# Parent  c9dc3cd9ce14a33c411400c0f0e38dee778fc7de
# Parent  3dbe675b43422f6115283e96e29c884657b0d1be

merge with beta

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3,10 +3,10 @@ List of contributors to RhodeCode projec
     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 @@ List of contributors to RhodeCode projec
     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 --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ 1.3.6 (**2012-05-16**)
 news
 ++++
 
+- chinese traditional translation
 
 fixes
 +++++