From: Philipp Dallig Date: Thu, 21 Apr 2016 08:43:38 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4958 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c118bc22a8f483f57594bb615914cfde4f5f29f2;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- c118bc22a8f483f57594bb615914cfde4f5f29f2