From: Philipp Dallig Date: Tue, 18 Oct 2016 08:55:02 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3966 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=b7f0f62c6997ec06b8cea3eb1072359988bc63ed;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- b7f0f62c6997ec06b8cea3eb1072359988bc63ed