From: Philipp Dallig Date: Tue, 26 Apr 2016 11:31:08 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4929 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b1b9f3fc15b17a8bd9a9a4b2ede72a1b17e71d23;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- b1b9f3fc15b17a8bd9a9a4b2ede72a1b17e71d23