From: Philipp Dallig Date: Mon, 15 Feb 2016 10:48:07 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5383 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=95ab1076ed266dedddf5a512c0c9ece6b1c18b8b;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 95ab1076ed266dedddf5a512c0c9ece6b1c18b8b