From: Philipp Dallig Date: Mon, 29 Feb 2016 14:42:19 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5282 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=da146418b2331b657206c112b42d55672cf63290;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- da146418b2331b657206c112b42d55672cf63290