Merge from Debian

[mirror/userdir-ldap.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 765fe93..9cd0018 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,19 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
 
  -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 13:40:04 +0200
 
+userdir-ldap (0.3.25+common1) unstable; urgency=low
+
+  [ Martin Zobel-Helas ]
+  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
+
+  [ Joerg Jaspert ]
+  * Use sync_keyrings from config file in ud-generate instead of a
+  hardcoded list
+  * Use add_keyrings from config file in ud-useradd instead of a
+  hardcoded list
+
+ -- Joerg Jaspert <joerg@debian.org>  Sun, 18 May 2008 13:32:01 +0200
+
 userdir-ldap (0.3.25) unstable; urgency=low
 
   * Make ssh-keys.tar.gz readable only by the user.