changeset 2272:a3fc1b09d715

merge with beta
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 15 May 2012 23:32:01 +0200
parents c9dc3cd9ce14 (current diff) 3dbe675b4342 (diff)
children 7b4bd52e38de
files CONTRIBUTORS docs/changelog.rst
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
 +++++