Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap
authorStephen Gran <steve@lobefin.net>
Thu, 29 Dec 2011 21:23:11 +0000 (21:23 +0000)
committerStephen Gran <steve@lobefin.net>
Thu, 29 Dec 2011 21:23:11 +0000 (21:23 +0000)

Trivial merge