X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=debian%2Fchangelog;h=1b89e07fffaad8a5981e5467cc702226f8632158;hp=773f9af6312f7895bbd3b96aea2713c9ffaaf8dc;hb=a4643d03b4e27dac768e01a3145d67ac9fe3187d;hpb=d01bbd7af2cdd97d04edfc96402d08bfb461587a

diff --git a/debian/changelog b/debian/changelog
index 773f9af..1b89e07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
 userdir-ldap-cgi (0.3.40) UNRELEASED; urgency=medium
 
+  [ Peter Palfrader ]
   * Add dependency on libcrypt-cbc-perl.
   * Use $config{maildomain} in update.cgi instead of hardcoded db.d.o.
+  * Use $config{sslcafile} instead of hardcoding the path to the SSL CA
+    in Util.pm.
+
+  [ Paul Wise ]
+  * ravel is no longer recommended for general shell usage
+  * Add a hint about how to merge existing SSH keys
+  * Update LDAP search docs for the usergroups changes
+  * Drop SSH key fingerprint info from machines.cgi pages
+  * Give an example of the show command
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 03 Jan 2015 13:49:22 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 03 Jan 2015 13:56:47 +0100
 
 userdir-ldap-cgi (0.3.39) unstable; urgency=medium