From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 6 Jul 2017 09:55:03 +0000 (+0200)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~2714^2~2
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=b7a63828c8a75d893d1b05efd1778d95f40ea04b;p=pixelpark%2Fhiera.git

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

b7a63828c8a75d893d1b05efd1778d95f40ea04b