[pypy-svn] r71800 - in pypy/release/1.2.x: . pypy/doc

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar  5 15:15:57 2010
New Revision: 71800

Modified:
   pypy/release/1.2.x/LICENSE
   pypy/release/1.2.x/pypy/doc/contributor.txt
Log:
svn merge svn+ssh://codespeak.net/svn/pypy/trunk -r71767:71768


Modified: pypy/release/1.2.x/LICENSE
==============================================================================
--- pypy/release/1.2.x/LICENSE	(original)
+++ pypy/release/1.2.x/LICENSE	Fri Mar  5 15:15:57 2010
@@ -85,7 +85,7 @@
     Lukas Renggli
     Guenter Jantzen
     Dinu Gherman
-    Bartosz SKOWRON
+    Bartosz Skowron
     Georg Brandl
     Ben Young
     Jean-Paul Calderone

Modified: pypy/release/1.2.x/pypy/doc/contributor.txt
==============================================================================
--- pypy/release/1.2.x/pypy/doc/contributor.txt	(original)
+++ pypy/release/1.2.x/pypy/doc/contributor.txt	Fri Mar  5 15:15:57 2010
@@ -58,7 +58,7 @@
     Lukas Renggli
     Guenter Jantzen
     Dinu Gherman
-    Bartosz SKOWRON
+    Bartosz Skowron
     Georg Brandl
     Ben Young
     Jean-Paul Calderone