From: Philipp Dallig Date: Tue, 9 Aug 2016 15:15:55 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4340^2~1 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3c19eb3cc83caf805314fff10e3a486b597fed3e;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 3c19eb3cc83caf805314fff10e3a486b597fed3e