Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/userdir-ldap
authorJulien Cristau <jcristau@debian.org>
Fri, 11 Oct 2019 21:29:54 +0000 (23:29 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 11 Oct 2019 21:29:54 +0000 (23:29 +0200)

Trivial merge