From: Philipp Dallig Date: Tue, 19 Jan 2016 17:04:18 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5471 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c078a22b05f4b406bd30d0b60962a592f2238e1a;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- c078a22b05f4b406bd30d0b60962a592f2238e1a