From: Philipp Dallig Date: Thu, 12 Jan 2017 09:03:23 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3623^2~3 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=68c953e85e5449a4477909d3a8f980c73d7efa80;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 68c953e85e5449a4477909d3a8f980c73d7efa80