merge lp:mailman/2.1 up to rev 1817

1 files changed, 111 insertions, 111 deletions

diff --git a/messages/marked.files b/messages/marked.files
index 3fd8ab55..59ab3d8a 100644
--- a/messages/marked.files
+++ b/messages/marked.files
@@ -1,133 +1,133 @@
-Mailman/SafeDict.py
-Mailman/Post.py
-Mailman/LockFile.py
-Mailman/Version.py
-Mailman/CSRFcheck.py
 Mailman/Autoresponder.py
-Mailman/Bouncer.py
-Mailman/Bouncers/Microsoft.py
-Mailman/Bouncers/Caiwireless.py
-Mailman/Bouncers/Yale.py
-Mailman/Bouncers/SimpleWarning.py
-Mailman/Bouncers/GroupWise.py
+Mailman/Gui/Topics.py
+Mailman/Gui/Archive.py
+Mailman/Gui/Bounce.py
+Mailman/Gui/Usenet.py
+Mailman/Gui/NonDigest.py
+Mailman/Gui/Membership.py
+Mailman/Gui/Passwords.py
+Mailman/Gui/Digest.py
+Mailman/Gui/Autoresponse.py
+Mailman/Gui/GUIBase.py
+Mailman/Gui/__init__.py
+Mailman/Gui/ContentFilter.py
+Mailman/Gui/Language.py
+Mailman/Gui/Privacy.py
+Mailman/Gui/General.py
+Mailman/MemberAdaptor.py
+Mailman/Commands/__init__.py
+Mailman/Pending.py
+Mailman/CSRFcheck.py
+Mailman/Digester.py
 Mailman/Bouncers/Yahoo.py
-Mailman/Bouncers/LLNL.py
 Mailman/Bouncers/SMTP32.py
+Mailman/Bouncers/Yale.py
 Mailman/Bouncers/AOL.py
-Mailman/Bouncers/Exchange.py
-Mailman/Bouncers/__init__.py
-Mailman/Bouncers/Compuserve.py
-Mailman/Bouncers/Postfix.py
-Mailman/Bouncers/Sina.py
-Mailman/Bouncers/BouncerAPI.py
-Mailman/Bouncers/Qmail.py
-Mailman/Bouncers/DSN.py
 Mailman/Bouncers/SimpleMatch.py
+Mailman/Bouncers/SimpleWarning.py
+Mailman/Bouncers/Caiwireless.py
+Mailman/Bouncers/Qmail.py
+Mailman/Bouncers/BouncerAPI.py
 Mailman/Bouncers/Netscape.py
+Mailman/Bouncers/Postfix.py
 Mailman/Bouncers/Exim.py
-Mailman/HTMLFormatter.py
-Mailman/GatewayManager.py
-Mailman/MTA/__init__.py
-Mailman/MTA/Manual.py
-Mailman/MTA/Postfix.py
-Mailman/MTA/Utils.py
-Mailman/Archiver/HyperArch.py
-Mailman/Archiver/Archiver.py
-Mailman/Archiver/__init__.py
-Mailman/Archiver/pipermail.py
-Mailman/Archiver/HyperDatabase.py
-Mailman/__init__.py
-Mailman/Message.py
-Mailman/MemberAdaptor.py
+Mailman/Bouncers/Exchange.py
+Mailman/Bouncers/Microsoft.py
+Mailman/Bouncers/LLNL.py
+Mailman/Bouncers/GroupWise.py
+Mailman/Bouncers/Compuserve.py
+Mailman/Bouncers/__init__.py
+Mailman/Bouncers/DSN.py
+Mailman/Bouncers/Sina.py
+Mailman/Mailbox.py
+Mailman/UserDesc.py
+Mailman/Version.py
+Mailman/Bouncer.py
+Mailman/versions.py
+Mailman/LockFile.py
+Mailman/SecurityManager.py
 Mailman/OldStyleMemberships.py
-Mailman/Pending.py
-Mailman/Digester.py
-Mailman/Cgi/options.py
-Mailman/Cgi/Auth.py
-Mailman/Cgi/subscribe.py
-Mailman/Cgi/admindb.py
-Mailman/Cgi/create.py
-Mailman/Cgi/listinfo.py
-Mailman/Cgi/__init__.py
-Mailman/Cgi/admin.py
-Mailman/Cgi/rmlist.py
-Mailman/Cgi/edithtml.py
-Mailman/Cgi/roster.py
-Mailman/Cgi/private.py
-Mailman/Cgi/confirm.py
-Mailman/Site.py
-Mailman/MailList.py
-Mailman/Utils.py
-Mailman/Gui/Autoresponse.py
-Mailman/Gui/Digest.py
-Mailman/Gui/NonDigest.py
-Mailman/Gui/__init__.py
-Mailman/Gui/GUIBase.py
-Mailman/Gui/Usenet.py
-Mailman/Gui/Bounce.py
-Mailman/Gui/Topics.py
-Mailman/Gui/Language.py
-Mailman/Gui/Archive.py
-Mailman/Gui/ContentFilter.py
-Mailman/Gui/Passwords.py
-Mailman/Gui/Membership.py
-Mailman/Gui/General.py
-Mailman/Gui/Privacy.py
+Mailman/Queue/RetryRunner.py
+Mailman/Queue/BounceRunner.py
+Mailman/Queue/MaildirRunner.py
+Mailman/Queue/VirginRunner.py
+Mailman/Queue/CommandRunner.py
+Mailman/Queue/Switchboard.py
+Mailman/Queue/sbcache.py
+Mailman/Queue/ArchRunner.py
 Mailman/Queue/NewsRunner.py
 Mailman/Queue/IncomingRunner.py
-Mailman/Queue/sbcache.py
-Mailman/Queue/Runner.py
 Mailman/Queue/OutgoingRunner.py
-Mailman/Queue/VirginRunner.py
-Mailman/Queue/MaildirRunner.py
 Mailman/Queue/__init__.py
-Mailman/Queue/ArchRunner.py
-Mailman/Queue/BounceRunner.py
-Mailman/Queue/CommandRunner.py
-Mailman/Queue/Switchboard.py
-Mailman/Queue/RetryRunner.py
-Mailman/Mailbox.py
-Mailman/Defaults.py
-Mailman/i18n.py
-Mailman/versions.py
-Mailman/Commands/__init__.py
-Mailman/Errors.py
-Mailman/htmlformat.py
+Mailman/Queue/Runner.py
 Mailman/ListAdmin.py
-Mailman/UserDesc.py
-Mailman/SecurityManager.py
+Mailman/Message.py
+Mailman/SafeDict.py
 Mailman/TopicMgr.py
-Mailman/Handlers/SpamDetect.py
+Mailman/Errors.py
+Mailman/HTMLFormatter.py
+Mailman/Utils.py
+Mailman/htmlformat.py
+Mailman/__init__.py
+Mailman/Logging/StampedLogger.py
+Mailman/Logging/Syslog.py
+Mailman/Logging/Logger.py
+Mailman/Logging/MultiLogger.py
+Mailman/Logging/Utils.py
+Mailman/Logging/__init__.py
+Mailman/MTA/Manual.py
+Mailman/MTA/Postfix.py
+Mailman/MTA/Utils.py
+Mailman/MTA/__init__.py
+Mailman/MailList.py
+Mailman/i18n.py
+Mailman/Deliverer.py
+Mailman/GatewayManager.py
+Mailman/Post.py
+Mailman/Handlers/FileRecips.py
+Mailman/Handlers/ToDigest.py
 Mailman/Handlers/Hold.py
-Mailman/Handlers/Moderate.py
-Mailman/Handlers/Approve.py
-Mailman/Handlers/AfterDelivery.py
+Mailman/Handlers/Cleanse.py
+Mailman/Handlers/AvoidDuplicates.py
+Mailman/Handlers/SpamDetect.py
+Mailman/Handlers/Acknowledge.py
 Mailman/Handlers/OwnerRecips.py
-Mailman/Handlers/ToUsenet.py
-Mailman/Handlers/ToArchive.py
-Mailman/Handlers/SMTPDirect.py
-Mailman/Handlers/Scrubber.py
-Mailman/Handlers/CookHeaders.py
 Mailman/Handlers/WrapMessage.py
+Mailman/Handlers/ToArchive.py
 Mailman/Handlers/MimeDel.py
-Mailman/Handlers/__init__.py
-Mailman/Handlers/Decorate.py
-Mailman/Handlers/ToOutgoing.py
-Mailman/Handlers/Replybot.py
-Mailman/Handlers/Emergency.py
 Mailman/Handlers/Tagger.py
-Mailman/Handlers/Acknowledge.py
+Mailman/Handlers/Moderate.py
+Mailman/Handlers/ToUsenet.py
+Mailman/Handlers/Emergency.py
+Mailman/Handlers/Scrubber.py
+Mailman/Handlers/SMTPDirect.py
+Mailman/Handlers/ToOutgoing.py
+Mailman/Handlers/Decorate.py
 Mailman/Handlers/Sendmail.py
+Mailman/Handlers/CookHeaders.py
 Mailman/Handlers/CalcRecips.py
+Mailman/Handlers/__init__.py
+Mailman/Handlers/AfterDelivery.py
 Mailman/Handlers/CleanseDKIM.py
-Mailman/Handlers/ToDigest.py
-Mailman/Handlers/FileRecips.py
-Mailman/Handlers/Cleanse.py
-Mailman/Handlers/AvoidDuplicates.py
-Mailman/Logging/StampedLogger.py
-Mailman/Logging/__init__.py
-Mailman/Logging/Logger.py
-Mailman/Logging/Utils.py
-Mailman/Logging/Syslog.py
-Mailman/Logging/MultiLogger.py
-Mailman/Deliverer.py
+Mailman/Handlers/Approve.py
+Mailman/Handlers/Replybot.py
+Mailman/Site.py
+Mailman/Defaults.py
+Mailman/Archiver/Archiver.py
+Mailman/Archiver/HyperDatabase.py
+Mailman/Archiver/HyperArch.py
+Mailman/Archiver/__init__.py
+Mailman/Archiver/pipermail.py
+Mailman/Cgi/listinfo.py
+Mailman/Cgi/options.py
+Mailman/Cgi/rmlist.py
+Mailman/Cgi/create.py
+Mailman/Cgi/edithtml.py
+Mailman/Cgi/Auth.py
+Mailman/Cgi/confirm.py
+Mailman/Cgi/private.py
+Mailman/Cgi/roster.py
+Mailman/Cgi/__init__.py
+Mailman/Cgi/admin.py
+Mailman/Cgi/subscribe.py
+Mailman/Cgi/admindb.py