From: Philipp Dallig Date: Fri, 4 Mar 2016 13:57:54 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5208 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5b22c732803f02e341c4a8c052a392af10028878;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 5b22c732803f02e341c4a8c052a392af10028878