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