From: Philipp Dallig Date: Tue, 26 Jan 2016 16:48:43 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5445 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=87cb0ea380f16c022609929ce29adf7d0942f3f1;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 87cb0ea380f16c022609929ce29adf7d0942f3f1