From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 13 Jun 2012 20:45:51 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi
X-Git-Tag: release-0.3.40~66
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e;hp=8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e;p=mirror%2Fuserdir-ldap-cgi.git

Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi

* 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi:
  And a changelog entry for Nick's change
  Use the changes@ address consistently in preference to change@
  Try a different CreateCryptSalt approach

Conflicts:
	debian/changelog
---