From: Philipp Dallig Date: Tue, 8 Mar 2016 14:27:40 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5175 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7297303a6596ff648e8b043422983586aafad8b3;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 7297303a6596ff648e8b043422983586aafad8b3