From: Philipp Dallig Date: Thu, 22 Dec 2016 10:20:55 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3702 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c5e3d0ddb364cd96567da2d158bec1b53c94f488;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- c5e3d0ddb364cd96567da2d158bec1b53c94f488