From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 3 Oct 2018 07:10:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'aerostitch/update_welcome_email'
X-Git-Tag: userdir-ldap-0.3.93~12
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=d1ef90f03b000b099331f7cb478e293576ef726c;hp=-c

Merge remote-tracking branch 'aerostitch/update_welcome_email'

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

d1ef90f03b000b099331f7cb478e293576ef726c
diff --combined debian/changelog
index 19e0a2c,2f7548c..4a3889a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,11 -4,14 +4,15 @@@ userdir-ldap (0.3.93) UNRELEASED; urgen
    * 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
  
+   [ Joseph Herlant ]
+   * Change references from alioth to salsa in the DD welcome email
+   (Closes: #910057)
+ 
   -- Peter Palfrader <weasel@debian.org>  Thu, 01 Mar 2018 20:47:02 +0100
  
  userdir-ldap (0.3.92) unstable; urgency=medium