From: Andrew M. Kuchling <amk@amk.ca>
Date: Tue, 4 Nov 2008 21:33:06 +0000 (+0000)
Subject: Backport text fix
X-Git-Tag: v2.6.1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39811fdabd42556a7555bb944a566e43e82116d5;p=thirdparty%2FPython%2Fcpython.git

Backport text fix
---

diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 44f019c03d1f..4c8c5b2a05e7 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -179,7 +179,7 @@ of Stellenbosch, South Africa.  Martin von Loewis put a
 lot of effort into importing existing bugs and patches from
 SourceForge; his scripts for this import operation are at
 http://svn.python.org/view/tracker/importer/ and may be useful to
-other projects wished to move from SourceForge to Roundup.
+other projects wishing to move from SourceForge to Roundup.
 
 .. seealso::
 
@@ -3282,5 +3282,6 @@ Acknowledgements
 The author would like to thank the following people for offering
 suggestions, corrections and assistance with various drafts of this
 article: Georg Brandl, Steve Brown, Nick Coghlan, Ralph Corderoy, 
-Jim Jewett, Kent Johnson, Chris Lambacher, Antoine Pitrou, Brian Warner.
+Jim Jewett, Kent Johnson, Chris Lambacher,  Martin Michlmayr, 
+Antoine Pitrou, Brian Warner.