Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap

* 'master' of ssh://db.debian.org/git/userdir-ldap:
  Minor changes from Holger (<201102021122.16183.holger@layer-acht.org>) Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/debian/changelog b/debian/changelog
index 888fbc3..37d711a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ userdir-ldap (0.3.7X) Xnstable; urgency=low
   * Update guest welcome template.
   * ud-gpgimport: handle guest keyrings.
   * ud-mailgate: Make updating of gender actually work.
+  * templates/change-reply: say a word about subjects in mail to admin@db.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 05 Jan 2011 09:53:06 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed, 02 Feb 2011 21:51:43 +0100
 
 userdir-ldap (0.3.78) unstable; urgency=low
 

diff --git a/templates/change-reply b/templates/change-reply
index b210676..a2df6d0 100644 (file)
--- a/templates/change-reply
+++ b/templates/change-reply
@@ -14,4 +14,7 @@ __RESULT__
 
 Please email __ADMIN__ if you have any questions.
 
+You should, however, pick a better subject than "Re: DB Change Request".
+If you don't then your mail might not get accepted.
+
 __ATTR__