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/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e

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
---

8f5508b9c16b83dd323f0bf8eabdfd67b979eb0e
diff --cc debian/changelog
index 224b677,db1b911..842f5df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,12 @@@
 -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