From: Philipp Dallig Date: Fri, 2 Dec 2016 10:21:42 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3725^2~105 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ac6012a50a4722f05bea9ddb327841572bbfc58a;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- ac6012a50a4722f05bea9ddb327841572bbfc58a