Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Tue, 15 Oct 2019 16:47:20 +0000 (18:47 +0200)
committerJulien Cristau <jcristau@debian.org>
Tue, 15 Oct 2019 16:47:20 +0000 (18:47 +0200)

Trivial merge