Merge remote-tracking branch 'aerostitch/update_welcome_email'

* aerostitch/update_welcome_email:
  Change references from alioth to salsa in the DD welcome email

diff --git a/debian/changelog b/debian/changelog
index 2f7548c..4a3889a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ userdir-ldap (0.3.93) UNRELEASED; urgency=medium
   * Also export a host's SSHFP records to additional dns names
     (sshfpHostname).
   * UDLdap.py: more useful exception if our array assumptions are violated.
+  * ud-guest-upgrade: do not add but replace privateSub.
 
   [ Ansgar Burchardt ]
   * ud-mailgate: include name of unknown host in error message