From: Philipp Dallig Date: Tue, 12 Jul 2016 13:37:09 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4543 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0ed58cc9708cc00749cc7ad0b9b7b6f4c90c2520;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 0ed58cc9708cc00749cc7ad0b9b7b6f4c90c2520