From: Peter Palfrader Date: Wed, 2 Feb 2011 20:56:25 +0000 (+0100) Subject: Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap X-Git-Tag: userdir-ldap-0.3.79~12 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=392461c15286c3491a10cffd9554480aac426f5a 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 --- 392461c15286c3491a10cffd9554480aac426f5a