Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Mon, 7 Oct 2019 19:39:28 +0000 (21:39 +0200)
committerJulien Cristau <jcristau@debian.org>
Mon, 7 Oct 2019 19:39:28 +0000 (21:39 +0200)

Trivial merge