From: Philipp Dallig Date: Mon, 22 Feb 2016 10:48:33 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5333 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6fa737326a83f452864bb7629aeb5f3c42a94727;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 6fa737326a83f452864bb7629aeb5f3c42a94727