Merge branch 'master' of ssh://draghi.debian.org/~/userdir-ldap