From: Philipp Dallig Date: Fri, 4 Mar 2016 13:05:38 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5212 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=74bf73a93ba843028cc072de51c0728bcc82d517;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 74bf73a93ba843028cc072de51c0728bcc82d517