1 files changed, 188 insertions, 187 deletions

diff --git a/src/mailman/docs/ACKNOWLEDGMENTS.rst b/src/mailman/docs/ACKNOWLEDGMENTS.rst
index 0b1e6246a..1cfdbd180 100644
--- a/src/mailman/docs/ACKNOWLEDGMENTS.rst
+++ b/src/mailman/docs/ACKNOWLEDGMENTS.rst
@@ -46,41 +46,41 @@ Copyright Assignees
 Here is the list of other contributors who have donated large bits of
 code, and have assigned copyright for contributions to the FSF:
 
-* Juan Carlos Rey Anaya
+* Andreas Schosser
 * Andrija Arsic
-* Richard Barrett
+* Ben Gertzfield
+* Cedric Knight
+* Claudia Schmidt
+* Ethan Mindlace Fremen
 * Jimmy Bergman
-* Stephan Berndts
-* Norbert Bollow
 * Joe Dugan
-* Ethan Mindlace Fremen
-* Ben Gertzfield
-* Victoriano Giralt
-* Stephen Goss
+* Juan Carlos Rey Anaya
+* Les Niles
 * Mads Kiilerich
-* Cedric Knight
+* Norbert Bollow
 * Patrick Ben Koetter
-* The Dragon De Monsyne
-* Les Niles
 * Reed O'Brien
-* Terri Oda
-* Simone Piunno
-* Claudia Schmidt
-* Andreas Schosser
+* Richard Barrett
 * Richard Wackerbarth
+* Simon Hanna
+* Simone Piunno
+* Stephan Berndts
+* Stephen Goss
+* The Dragon De Monsyne
+* Victoriano Giralt
 
 
 Special Thanks
 ==============
 
-Very special thanks to Andrija Arsic for his winning new GNU Mailman logos.
+Very special thanks to Andrija Arsic for his winning GNU Mailman logos.
 
 Thanks also go to the following people for their important contributions in
 other aspects of the Mailman project:
 
 * Brad Knowles
-* JC Dill
 * Clytie Siddall
+* JC Dill
 
 Thanks also to Dragon for his original Mailman logo contribution, and to Terri
 Oda for the neat shortcut icon and the member documentation.
@@ -94,201 +94,202 @@ suggestions, bug fixes, testing, etc., or who have been very helpful in
 answering questions on mailman-users.  Please let me know if you have been
 left off the list!
 
-* David Abrahams
-* William Ahern
-* Terry Allen
-* Jose Paulo Moitinho de Almeida
-* Sven Anderson
-* Matthias Andree
-* Anton Antonov
-* Mike Avery
-* Stonewall Ballard
-* Moreno Baricevic
-* Jimmy Bergman
-* Jeff Berliner
-* Stuart Bishop
-* David Blomquist
-* Bojan
-* Søren Bondrup
-* Grant Bowman
+* "office"
+* Abhilash Raj
+* Ademar de Souza Reis, Jr.
 * Alessio Bragadini
-* J\. D\. Bronson
-* Stan Bubrouski
-* Daniel Buchmann
+* Alexander Sulfrian
+* Andrew Kuchling
+* Andrew Martynov
+* Anti Veeranna
+* Anton Antonov
+* Ashley M. Kirchner
+* Balazs Nagy
+* Bartosz Sawicki
 * Ben Burnett
-* Ted Cabeen
-* Mentor Cana
-* John Carnes
-* Julio A. Cartaya
-* Claudio Cattazzo
-* Donn Cave
-* David Champion
-* Hye-Shik Chang
-* Eric D. Christensen
-* Tom G. Christensen
-* Paul Cox
-* Stefaniu Criste
-* Robert Daeley
-* Ned Dawes
-* Emilio Delgado
-* John Dennis
-* Stefan Divjak
-* Maximillian Dornseif
-* Fred Drake
-* Maxim Dzumanenko
-* Piarres Beobide Egaña
-* Rob Ellis
-* Kerem Erkan
-* Fil
-* Patrick Finnerty
+* Bernhard Reiter
+* Bert Hubert
+* Bill Wagner
+* Blair Zajac
 * Bob Fleck
-* Erik Forsberg
-* Darrell Fuhriman
-* Robert Garrigós
+* Bob Puff
+* Bojan
+* Cabel Sasser
 * Carson Gaspar
-* Pascal GEORGE
-* Vadim Getmanshchuk
+* Chris Kolar
+* Chris Pepper
+* Chris Ryan
+* Chris Snell
+* Christian Reis
+* Christopher P. Lindsey
+* Chuq Von Rospach
+* Claudio Cattazzo
+* Dai Xiaoguang
+* Dale Newfield
+* Dale Stimson
+* Dan Mick
+* Dan Ohnesorg
+* Dan Wilder
+* Daniel Buchmann
+* Daniel Zeiss
+* Danny Terweij
+* Dario Lopez-Kästen
+* Darrell Fuhriman
+* David Abrahams
+* David B. O'Donnell
+* David Blomquist
+* David Champion
 * David Gibbs
+* David Habben
+* David Martínez Moreno
+* David Soto
+* David T-G
+* Dirk Mueller
 * Dmitri I GOULIAEV
-* Terry Grace
+* Don Porter
+* Donn Cave
+* Ed Lau
+* Eddie Kohler
+* Emilio Delgado
+* Eric D. Christensen
+* Erik Forsberg
+* Erik Myllymaki
+* Eva Österlind
 * Federico Grau
-* Pekka Haavisto
-* David Habben
-* Stig Hackvan
-* Jeff Hahn
-* Terry Hardie
-* Paul Hebble
-* Tollef Fog Heen
-* Peer Heinlein
-* James Henstridge
-* Walter Hop
-* Bert Hubert
+* Fil
+* Florian Weimer
+* Francesco Potortì
+* Franck Martin
+* Fred Drake
+* Garey Mills
+* Gerald Oskoboiny
+* Gergely Madarasz
+* Gleydson Mazioli da Silva
+* Grant Bowman
+* Greg Lindahl
+* Greg Stein
+* Greg Ward
+* Guido van Rossum
+* Harald Koch
+* Heiko Rommel
 * Henny Huisman
-* Jeremy Hylton
+* Hrvoje Niksic
+* Hye-Shik Chang
 * Ikeda Soji
-* Rostyk Ivantsiv
-* Ron Jarrell
-* Matthias Juchem
-* Tamito KAJIYAMA
-* Nino Katic
-* SHIGENO Kazutaka
-* Ashley M. Kirchner
-* Matthias Klose
-* Harald Koch
-* Patrick Koetter
-* Eddie Kohler
-* Chris Kolar
-* Uros Kositer
-* Andrew Kuchling
-* Ricardo Kustner
-* L'homme Moderne
-* Sylvain Langlade
-* Ed Lau
 * J C Lawrence
-* Greg Lindahl
-* Christopher P. Lindsey
-* Martin von Loewis
-* Dario Lopez-Kästen
-* Tanner Lovelace
+* J\. D\. Bronson
+* James Henstridge
+* Jason R. Mastaler
 * Jay Luker
-* Gergely Madarasz
-* Luca Maranzano
+* Jeff Berliner
+* Jeff Hahn
+* Jens Vagelpohl
+* Jeremy Hylton
+* Jim Tittsler
+* Jimmy Bergman
+* Joe Peterson
 * John A. Martin
-* Andrew Martynov
-* Jason R. Mastaler
-* Michael Mclay
-* Michael Meltzer
+* John Carnes
+* John Dennis
+* John Read
+* Jon Parise
+* Jonas Muerer
+* Jose Paulo Moitinho de Almeida
+* Julio A. Cartaya
+* Kai Schaetzl
+* Karoly Segesdi
+* Kathleen Webb
+* Kerem Erkan
+* L'homme Moderne
+* Les Niles
+* Luca Maranzano
+* Luigi Rosa
 * Marc MERLIN
-* Nigel Metheringham
-* Dan Mick
-* Garey Mills
+* Mark Weaver
 * Martin Mokrejs
+* Martin Pool
+* Martin von Loewis
+* Matthias Andree
+* Matthias Juchem
+* Matthias Klose
+* Maxim Dzumanenko
+* Maximillian Dornseif
+* Mentor Cana
 * Michael Fischer v. Mollard
-* David Martínez Moreno
-* Dirk Mueller
-* Jonas Muerer
-* Erik Myllymaki
-* Balazs Nagy
-* Moritz Naumann
-* Dale Newfield
-* Hrvoje Niksic
-* Les Niles
+* Michael Mclay
+* Michael Meltzer
+* Michael Ranner
+* Michael Yount
+* Mike Avery
 * Mike Noyes
-* David B. O'Donnell
-* Timothy O'Malley
-* "office"
-* Dan Ohnesorg
-* Gerald Oskoboiny
-* Eva Österlind
-* Toni Panadès
-* Jon Parise
-* Chris Pepper
-* Tim Peters
-* Joe Peterson
+* Mikhail Sobolev
+* Mikhail Zabaluev
+* Moreno Baricevic
+* Moritz Naumann
+* Ned Dawes
+* Nicholas Russo
+* Nigel Metheringham
+* Nino Katic
+* Noam Zeilberger
+* Ousmane Wilane
+* Owen Taylor
+* Pascal GEORGE
+* Pasi Sjöholm
+* Patrick Finnerty
+* Patrick Koetter
+* Paul Cox
+* Paul Hebble
+* Peer Heinlein
+* Pekka Haavisto
+* Piarres Beobide Egaña
 * PieterB
+* Ping Yeh
+* Ricardo Kustner
+* Rob Ellis
+* Robert Daeley
+* Robert Garrigós
 * Rodolfo Pilas
-* Skye Poier
-* Martin Pool
-* Don Porter
-* Francesco Potortì
-* Bob Puff
-* Abhilash Raj
-* Michael Ranner
-* John Read
+* Roger Tsang
+* Ron Jarrell
+* Rostyk Ivantsiv
+* SHIGENO Kazutaka
 * Sean Reifschneider
-* Christian Reis
-* Ademar de Souza Reis, Jr.
-* Bernhard Reiter
+* Seb Wills
+* Skye Poier
+* Stan Bubrouski
+* Stefan Divjak
+* Stefaniu Criste
 * Stephan Richter
-* Tristan Roddis
-* Heiko Rommel
-* Luigi Rosa
-* Guido van Rossum
-* Nicholas Russo
-* Chris Ryan
-* Cabel Sasser
-* Bartosz Sawicki
-* Kai Schaetzl
-* Karoly Segesdi
-* Gleydson Mazioli da Silva
-* Pasi Sjöholm
-* Chris Snell
-* Mikhail Sobolev
-* David Soto
-* Greg Stein
-* Dale Stimson
+* Stig Hackvan
+* Stonewall Ballard
+* Stuart Bishop
 * Students of HIT <mailman-cn@mail.cs.hit.edu.cn>
-* Alexander Sulfrian
+* Sven Anderson
+* Sylvain Langlade
 * Szabolcs Szigeti
-* Vizi Szilard
-* David T-G
-* Owen Taylor
-* Danny Terweij
-* Jim Tittsler
+* Søren Bondrup
+* Tamito KAJIYAMA
+* Tanner Lovelace
+* Ted Cabeen
+* Terry Allen
+* Terry Grace
+* Terry Hardie
+* Tim Peters
+* Timothy O'Malley
 * Todd (Freedom Lover)
-* Roger Tsang
-* Chuq Von Rospach
-* Jens Vagelpohl
-* Valia V. Vaneeva
-* Anti Veeranna
 * Todd Vierling
-* Bill Wagner
-* Greg Ward
-* Mark Weaver
-* Kathleen Webb
-* Florian Weimer
-* Ousmane Wilane
-* Dan Wilder
-* Seb Wills
-* Dai Xiaoguang
-* Ping Yeh
-* YASUDA Yukihiro
-* Michael Yount
-* Blair Zajac
-* Mikhail Zabaluev
-* Noam Zeilberger
-* Daniel Zeiss
 * Todd Zullinger
+* Tollef Fog Heen
+* Tom G. Christensen
+* Toni Panadès
+* Tristan Roddis
+* Uros Kositer
+* Vadim Getmanshchuk
+* Valia V. Vaneeva
+* Vizi Szilard
+* Walter Hop
+* William Ahern
+* YASUDA Yukihiro
 
 And everyone else on mailman-developers@python.org and
 mailman-users@python.org!  Thank you, all.