From: Philipp Dallig Date: Wed, 24 Feb 2016 10:11:37 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5309 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=720900d3369745dce207f3701cea11c774c3b1bb;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 720900d3369745dce207f3701cea11c774c3b1bb