From: Philipp Dallig Date: Mon, 18 Apr 2016 14:58:08 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4974 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3acdefeaec051843ad40d1b20709a9b055429625;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 3acdefeaec051843ad40d1b20709a9b055429625