From: Philipp Dallig Date: Tue, 9 Feb 2016 15:35:32 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5409 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5bceac3eb1060ed5ea731b3f00955ea79f9d01bb;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 5bceac3eb1060ed5ea731b3f00955ea79f9d01bb