merge with 3.2

sandrotosi · sandrotosi · commit 488a56d2fb36 · 2012-02-19T12:30:47.000+01:00
diff --git 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.
 
