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