From: Philipp Dallig Date: Thu, 7 Apr 2016 08:31:47 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5040 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2f45867a51b9a702427e5f18a8fd9d250e91f0f1;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 2f45867a51b9a702427e5f18a8fd9d250e91f0f1