From: Philipp Dallig Date: Thu, 3 Mar 2016 16:57:20 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5219 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e19d60e3155a2c6195f772fd8546acca4e35c47b;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- e19d60e3155a2c6195f772fd8546acca4e35c47b