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