From: Philipp Dallig Date: Wed, 24 May 2017 14:04:20 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~2918 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=60925847ffd1c5095872011298aae9e599ab89a5;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 60925847ffd1c5095872011298aae9e599ab89a5