From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Thu, 26 Sep 2019 16:53:27 +0000 (+0100)
Subject: Merge branch 'salsa' into fordsa
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d0091af720e836f4ca79109fca7befe15456834e;hp=d04bd18d90d8aaea55e6c9015d08a315a059aeec;p=mirror%2Fdsa-puppet.git

Merge branch 'salsa' into fordsa
---