From 5dfce4a0caf9ee486a9ad88c30a77cfe05752b40 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 1 Jun 2011 08:00:12 +0200
Subject: [PATCH] update authors to reflect more current situation

---
 AUTHORS  | 17 +++++++++--------
 setup.py |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d142908b1..6f9197924 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,16 +1,17 @@
 Holger Krekel, holger at merlinux eu
-Benjamin Peterson, benjamin at python org
-Ronny Pfannschmidt, Ronny.Pfannschmidt at gmx de
-Guido Wesdorp, johnny at johnnydebris net 
-Samuele Pedroni, pedronis at openend se 
-Carl Friedrich Bolz, cfbolz at gmx de
-Armin Rigo, arigo at tunes org 
-Maciek Fijalkowski, fijal at genesilico pl
-Brian Dorsey, briandorsey at gmail com 
 merlinux GmbH, Germany, office at merlinux eu
 
 Contributors include:: 
 
+Ronny Pfannschmidt
+Benjamin Peterson
+Floris Bruynooghe
+Samuele Pedroni
+Carl Friedrich Bolz
+Armin Rigo
+Maciek Fijalkowski
+Guido Wesdorp
+Brian Dorsey
 Ross Lawley
 Ralf Schmitt
 Chris Lamb 
diff --git a/setup.py b/setup.py
index 516847798..2cf10cb72 100644
--- a/setup.py
+++ b/setup.py
@@ -9,13 +9,13 @@ cross-project testing tool for Python.
 
 Platforms: Linux, Win32, OSX
 
-Interpreters: Python versions 2.4 through to 3.2, Jython 2.5.1 and PyPy
+Interpreters: Python versions 2.4 through to 3.2, Jython 2.5.1 and PyPy-1.5
 
 Bugs and issues: http://bitbucket.org/hpk42/pytest/issues/
 
 Web page: http://pytest.org
 
-(c) Holger Krekel and others, 2004-2010
+(c) Holger Krekel and others, 2004-2011
 """
 def main():
     setup(
@@ -26,7 +26,7 @@ def main():
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
-        author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
+        author='Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris Bruynooghe and others',
         author_email='holger at merlinux.eu',
         entry_points= make_entry_points(),
         install_requires=['py>1.4.3'],
@@ -67,4 +67,4 @@ def make_entry_points():
     return {'console_scripts': l}
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()