From: Philipp Dallig Date: Thu, 10 Mar 2016 14:26:41 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5155 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e8ef1c230d199ff625b12a926d08dbfc4add633c;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- e8ef1c230d199ff625b12a926d08dbfc4add633c