* '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
-userdir-ldap-cgi (0.3.37) Xnstable; urgency=low
+userdir-ldap-cgi (0.3.37) UNRELEASED; urgency=low
+
++ [ Martin Zobel-Helas ]
+ * use libjs-jquery-tablesorter to sort machines.cgi
- -- Martin Zobel-Helas <zobel@debian.org> Fri, 09 Mar 2012 10:03:46 +0100
+ [ Nick Mathewson ]
+ * Use the changes@ address consistently in preference to change@.
+
+ -- Peter Palfrader <weasel@debian.org> Sun, 10 Jun 2012 22:03:14 +0200
userdir-ldap-cgi (0.3.36) unstable; urgency=low