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