From: Philipp Dallig Date: Thu, 11 Feb 2016 09:50:05 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5398 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=58eff54f2bb2c425ee37baf0d7654e5587fd321f;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 58eff54f2bb2c425ee37baf0d7654e5587fd321f