From: Philipp Dallig Date: Tue, 8 Mar 2016 15:44:21 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5173 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=469cf92fc76bcb15a932a82f1d9c7c12d3aba73f;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 469cf92fc76bcb15a932a82f1d9c7c12d3aba73f