From: Philipp Dallig Date: Thu, 28 Jul 2016 08:52:11 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4423 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=661cccad66b5660d23b4fd51336aaeb800b4f19d;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 661cccad66b5660d23b4fd51336aaeb800b4f19d