From: Philipp Dallig Date: Tue, 28 Feb 2017 13:57:58 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3517 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=63ee6d93c62bff02985105aeee781d5b43cfc667;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 63ee6d93c62bff02985105aeee781d5b43cfc667