From: Philipp Dallig Date: Thu, 3 Mar 2016 15:20:49 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5221 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=16a880bd5f871e5ea8b4ba920125f91f3ac067b2;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 16a880bd5f871e5ea8b4ba920125f91f3ac067b2