From: Oliver Böttcher Date: Wed, 2 Mar 2016 09:19:25 +0000 (+0100) Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera X-Git-Tag: v0.1.0~5259^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=75cc609fed8419736fe1d588bc318b69fecb98bb;p=pixelpark%2Fhiera.git Merge branch 'master' of git.pixelpark.com:puppet/hiera --- 75cc609fed8419736fe1d588bc318b69fecb98bb