From: Oliver Böttcher Date: Thu, 3 Mar 2016 14:29:23 +0000 (+0100) Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera X-Git-Tag: v0.1.0~5221^2~2^2~1 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=98b7a30b5293503f01e96e283cbfe8134ceef800;p=pixelpark%2Fhiera.git Merge branch 'master' of git.pixelpark.com:puppet/hiera --- 98b7a30b5293503f01e96e283cbfe8134ceef800