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