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


Trivial merge