From: Philipp Dallig Date: Tue, 17 Jan 2017 10:59:26 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3605 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=24dd2cbe427833e91a0fae8d31988c1e0fcab133;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 24dd2cbe427833e91a0fae8d31988c1e0fcab133