Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 8 Mar 2012 18:24:52 +0000 (19:24 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 8 Mar 2012 18:24:52 +0000 (19:24 +0100)
commitb90dc4f527905c4aeaf41a7ed95995345f703eaf
tree45b2f1509be7def9629dbc3582e3bdcb3731e34a
parenta5c0027c487d7b6e1ed6a82dbe3bbdebbaa51c12
parentae99a873b1ed078bffc3342461aab9f738436bb7
Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi

* 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi:
  add webpassword Signed-off-by: Martin Zobel-Helas <zobel@debian.org>