summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-02-19 11:30:47 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-02-19 11:30:47 (GMT)
commit488a56d2fb3697539fdd6b44df378954066924fe (patch)
tree712a8a149ef9dac593cf285d6036d59594ddeb7e
parent1ee86a15157b5b9e145dbf7c9b5a23fda60c8454 (diff)
parentf06d444f5a1b33c3585e6de4cc3f312d2dd3bed5 (diff)
downloadcpython-488a56d2fb3697539fdd6b44df378954066924fe.zip
cpython-488a56d2fb3697539fdd6b44df378954066924fe.tar.gz
cpython-488a56d2fb3697539fdd6b44df378954066924fe.tar.bz2
merge with 3.2
-rw-r--r--Doc/whatsnew/2.4.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index d94e66f..faf9270 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -1554,7 +1554,7 @@ Acknowledgements
================
The author would like to thank the following people for offering suggestions,
-corrections and assistance with various drafts of this article: Koray Can, Hye-
-Shik Chang, Michael Dyck, Raymond Hettinger, Brian Hurt, Hamish Lawson, Fredrik
-Lundh, Sean Reifschneider, Sadruddin Rejeb.
+corrections and assistance with various drafts of this article: Koray Can,
+Hye-Shik Chang, Michael Dyck, Raymond Hettinger, Brian Hurt, Hamish Lawson,
+Fredrik Lundh, Sean Reifschneider, Sadruddin Rejeb.