Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap
authorStephen Gran <steve@lobefin.net>
Wed, 15 Jan 2014 08:13:45 +0000 (08:13 +0000)
committerStephen Gran <steve@lobefin.net>
Wed, 15 Jan 2014 08:13:45 +0000 (08:13 +0000)

Trivial merge