From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Wed, 1 Mar 2017 11:01:46 +0000 (+0100)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~3515
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=1590517154dee45e247ca9d4cffc3428d5e742ee;p=pixelpark%2Fhiera.git

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

1590517154dee45e247ca9d4cffc3428d5e742ee