From: Philipp Dallig Date: Wed, 27 Apr 2016 11:20:02 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4918 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=75868356ce8220ab528d5bf5adbfa11880bdda42;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 75868356ce8220ab528d5bf5adbfa11880bdda42