Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 13 Jun 2012 20:45:51 +0000 (22:45 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 13 Jun 2012 20:45:51 +0000 (22:45 +0200)
* '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


No differences found