Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)

diff --cc debian/changelog
index d5ca5f8,55cf883..c0e5019
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,14 @@@
- userdir-ldap (0.3.XX) Xnstable; urgency=low
 -userdir-ldap (0.3.25+common1) unstable; urgency=low
++userdir-ldap (0.3.26) unstable; urgency=low
  
 -  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
 +  * ud-replicate: sgran pointed out that if all we care about ignoring is
 +    EEXIST then we should use mkdir -p instead of [ -d userkeys ] || mkdir
 +    userkeys.
 +  * ud-mailgate: a bug in DoSSH caused all changes to fail that came after
 +    DoSSH in HandleChange.  Now DoSSH properly returns without raising an
 +    exception if the line to handle is not an ssh public key.
++  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP). [zobel]
  
-  -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:25:26 +0200
 - -- Martin Zobel-Helas <zobel@debian.org>  Sun, 18 May 2008 13:03:42 +0200
++ -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:27:50 +0200
  
  userdir-ldap (0.3.25) unstable; urgency=low