From: Philipp Dallig Date: Thu, 11 Aug 2016 09:40:08 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4328 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1a9ad798dd413b6246f9d6e30d6c0184ffb8f254;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 1a9ad798dd413b6246f9d6e30d6c0184ffb8f254