From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Thu, 14 Sep 2017 10:31:43 +0000 (+0200)
Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera
X-Git-Tag: v0.1.0~2437^2~13
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=15e0bf8f6f8750d16a5cb5780a1e52884740a790;p=pixelpark%2Fhiera.git

Merge branch 'master' of git.pixelpark.com:puppet/hiera
---

15e0bf8f6f8750d16a5cb5780a1e52884740a790