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

Trivial merge