From: Philipp Dallig Date: Mon, 7 Mar 2016 16:15:50 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5185 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f7be94055da6898e328f98c94a7413aeee664c46;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- f7be94055da6898e328f98c94a7413aeee664c46