From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Sat, 28 Sep 2019 14:22:21 +0000 (+0100)
Subject: Merge branch 'salsa' into fordsa
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=refs%2Fheads%2Ffordsaold

Merge branch 'salsa' into fordsa
---

96133fd453443da74a750d4f10fbe89b749e16ac