X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Fchangelog;h=d3aa26ba2a0b911c31a71bc19ced3daa8175f1af;hb=9868a2b741c1b82156f3d75c8dbc74ed8f5521f1;hp=a370831823f9031346507d0aaf36f039eadc00f4;hpb=5baa04a4b056e40c196149681f144c4a35396736;p=mirror%2Fuserdir-ldap.git

diff --git a/debian/changelog b/debian/changelog
index a370831..d3aa26b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,12 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
     has historically been used as the root of the user tree.
   * Allow a set of users to be ignored for picking UIDs.
   * When picking uid/gid numbers try to pick the same number for both.
+  * Merge from torproject.org:
+    - Allow sshRSAAuthKey for role accounts.
+    - Support ssh key attributes for gitolite export.
+    - Add ssh-gitolite support.
+  * debianGroups may have cn attribute (helpful when putting samba stuff into
+    ldap).
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
@@ -29,7 +35,7 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
   * ud-generate: generate webPasswords
   * ud-replicate: set correct permissions for web-passwords
 
- -- Stephen Gran <sgran@debian.org>  Sat, 10 Mar 2012 08:05:24 +0000
+ -- Peter Palfrader <weasel@debian.org>  Sat, 10 Mar 2012 15:21:12 +0100
 
 userdir-ldap (0.3.79) unstable; urgency=low