From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Tue, 29 Aug 2017 13:52:23 +0000 (+0200)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~2513^2~12
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=2f072ea087bf05b5f0774476a3ec94690c36abc3;p=pixelpark%2Fhiera.git

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

2f072ea087bf05b5f0774476a3ec94690c36abc3