Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap
authorPeter Palfrader <peter@palfrader.org>
Wed, 2 Feb 2011 20:56:25 +0000 (21:56 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 2 Feb 2011 20:56:25 +0000 (21:56 +0100)
* 'master' of ssh://db.debian.org/git/userdir-ldap:
  Minor changes from Holger (<201102021122.16183.holger@layer-acht.org>) Signed-off-by: Martin Zobel-Helas <zobel@debian.org>


Trivial merge