From: Philipp Dallig Date: Thu, 14 Apr 2016 13:45:26 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4977 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=948f3b0a7cc3c4b50aa6f8a4ef0d6545f4dd13d0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 948f3b0a7cc3c4b50aa6f8a4ef0d6545f4dd13d0