From: Philipp Dallig Date: Thu, 25 Feb 2016 17:38:31 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5297 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=66c9907369f61faf772d9342dca3bc2723715f1d;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 66c9907369f61faf772d9342dca3bc2723715f1d