From: Sven Marcel Buchholz Date: Fri, 18 Mar 2016 14:37:27 +0000 (+0100) Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera X-Git-Tag: v0.1.0~5126^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d12a16f7115f8f57875a4641392985ef2721b9a2;p=pixelpark%2Fhiera.git Merge branch 'master' of git.pixelpark.com:puppet/hiera --- d12a16f7115f8f57875a4641392985ef2721b9a2