diff options
| author | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-16 11:49:31 +0900 |
|---|---|---|
| committer | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-16 11:49:31 +0900 |
| commit | 91ece7cba085949f2f61ba9fddb02ae7dd6506ab (patch) | |
| tree | fdd5ed7bb868a44c6d31dd111a57e80f0a237ed1 /Mailman/Bouncers/Qmail.py | |
| parent | 8f5d8d2eb9e8bf62a598f126419d18eb3163050e (diff) | |
| parent | f383c36db54e30c67f9bf22fc1498e9fed7b65d1 (diff) | |
| download | mailman2-91ece7cba085949f2f61ba9fddb02ae7dd6506ab.tar.gz mailman2-91ece7cba085949f2f61ba9fddb02ae7dd6506ab.tar.xz mailman2-91ece7cba085949f2f61ba9fddb02ae7dd6506ab.zip | |
merge and commit again
Diffstat (limited to 'Mailman/Bouncers/Qmail.py')
| -rw-r--r-- | Mailman/Bouncers/Qmail.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Mailman/Bouncers/Qmail.py b/Mailman/Bouncers/Qmail.py index def4abfa..2c02c1ae 100644 --- a/Mailman/Bouncers/Qmail.py +++ b/Mailman/Bouncers/Qmail.py @@ -1,17 +1,17 @@ -# Copyright (C) 1998-2006 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. @@ -33,7 +33,9 @@ import email.Iterators introtags = [ 'Hi. This is the', "We're sorry. There's a problem", - 'Check your send e-mail address.' + 'Check your send e-mail address.', + 'This is the mail delivery agent at', + 'Unfortunately, your mail was not delivered' ] acre = re.compile(r'<(?P<addr>[^>]*)>:') |