From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Tue, 16 May 2017 08:18:28 +0000 (+0200)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~2995^2~4
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=333a7b8c5330be16c343e6922aed346a29787b19;p=pixelpark%2Fhiera.git

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

333a7b8c5330be16c343e6922aed346a29787b19