From: Philipp Dallig Date: Mon, 23 May 2016 09:41:05 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4831 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=140bd26e2f58ed19850159082eedd20424f34de0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 140bd26e2f58ed19850159082eedd20424f34de0