From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Tue, 22 Aug 2017 08:21:55 +0000 (+0200)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~2569^2
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=7a0367e8a601346c4599f6562812beb9ed2273ba;p=pixelpark%2Fhiera.git

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

7a0367e8a601346c4599f6562812beb9ed2273ba