From: Philipp Dallig Date: Tue, 19 Apr 2016 15:52:18 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4970 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2b9fda96328e5022595729cf8f3960b4b5244555;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 2b9fda96328e5022595729cf8f3960b4b5244555