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