From: Philipp Dallig Date: Mon, 19 Dec 2016 12:47:28 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3717 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=53341dbddbcf5a27cd7a221b5649a94ab86fea0d;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 53341dbddbcf5a27cd7a221b5649a94ab86fea0d