From: Philipp Dallig Date: Wed, 9 Mar 2016 15:34:34 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5163 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0b5e7b056f232ff2390da032eb0bb5b5557e032e;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 0b5e7b056f232ff2390da032eb0bb5b5557e032e