From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 23 Mar 2012 18:19:56 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap
X-Git-Tag: userdir-ldap-0.3.85~63
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=76edc8a3b0fe0a71cdb54fe4aa7f4cb873185212;hp=eef60697a679b345869446d4def36e115fdecb84;p=mirror%2Fuserdir-ldap.git

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

* 'master' of git+ssh://db.debian.org/git/userdir-ldap:
  change mailPreserveSuffixSeparator to a string Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/debian/changelog b/debian/changelog
index 6a3f6d3..6931ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,8 +61,11 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
   * ud-generate: generate webPasswords
   * ud-replicate: set correct permissions for web-passwords
   * add freecdb to depends
+  * userdir-ldap.schema
+    - add webPasswords
+    - add mailPreserveSuffixSeperator
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 12 Mar 2012 16:56:11 +0100
+ -- Martin Zobel-Helas <zobel@debian.org>  Fri, 23 Mar 2012 19:19:16 +0100
 
 userdir-ldap (0.3.79) unstable; urgency=low