Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Fri, 25 Oct 2019 20:13:37 +0000 (22:13 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 25 Oct 2019 20:13:37 +0000 (22:13 +0200)

Trivial merge