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)
commit392461c15286c3491a10cffd9554480aac426f5a
tree4804871f871ae2f5234df22e427c8e7fd749ddfb
parentbd041ec01e244ad0d1d47261a0c3de54ea12fccd
parent9b8cdec5d40e7f5f6ac03ecd2fa8eaeddf95ae68
Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap

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