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