X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Fchangelog;h=40b62b29f9a292614c03335091fe3066d1483647;hb=db4d3ed0c8fe4f287da7bfe13f041dff5892fed5;hp=3a394bdf3cd00120b48252f0f543db9e98b1d296;hpb=c4f7f37b019553aabda9ae50d88c71d7ac7cf5e5;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/debian/changelog b/debian/changelog
index 3a394bd..40b62b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 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
+
  -- Peter Palfrader <weasel@debian.org>  Sat, 03 Jan 2015 13:56:47 +0100
 
 userdir-ldap-cgi (0.3.39) unstable; urgency=medium