From: Oliver Böttcher Date: Thu, 28 Jan 2016 10:00:49 +0000 (+0100) Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera X-Git-Tag: v0.1.0~5442 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=53ab9c9f781c3ade381595e5fadd5868ddb9fbdd;p=pixelpark%2Fhiera.git Merge branch 'master' of git.pixelpark.com:puppet/hiera --- 53ab9c9f781c3ade381595e5fadd5868ddb9fbdd