projects / mirror / userdir-ldap-cgi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8572cea 5cb87af)
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)
commit8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e
tree70c9c5de3d3e04bdaad8e1fe710523f1a8c1a242tree | snapshot
parent8572ceaaa11c6282001d267684ed2fdbb653a198commit | diff
parent5cb87afd538ccefcc819032e7ac832a410ff0f52commit | diff
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
debian/changelog diff1 | diff2 | blob | history
Mirror of Debian's userdir-ldap-cgi repository