From: Philipp Dallig Date: Tue, 24 May 2016 08:29:37 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4823 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=965fb0519850f7c1e9a97156e1715f0e769740c0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 965fb0519850f7c1e9a97156e1715f0e769740c0