From: Philipp Dallig Date: Wed, 23 Mar 2016 17:02:18 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5097 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=15478752299776b112e01198586a5f79e3cdd1f2;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 15478752299776b112e01198586a5f79e3cdd1f2