From: Oliver Böttcher Date: Thu, 6 Oct 2016 09:14:03 +0000 (+0200) Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera X-Git-Tag: v0.1.0~4037^2~2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=953994dde6b88dc5054b42471196b5a6b73adb32;p=pixelpark%2Fhiera.git Merge branch 'master' of git.pixelpark.com:puppet/hiera --- 953994dde6b88dc5054b42471196b5a6b73adb32