From: Philipp Dallig Date: Thu, 25 Feb 2016 12:30:17 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5301 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=098c15e255a4fe37cccf532a600542a00c694a63;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 098c15e255a4fe37cccf532a600542a00c694a63