Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Sun, 29 Sep 2019 11:48:50 +0000 (13:48 +0200)
committerJulien Cristau <jcristau@debian.org>
Sun, 29 Sep 2019 11:48:50 +0000 (13:48 +0200)

Trivial merge