From: Philipp Dallig Date: Mon, 30 May 2016 09:52:44 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4770 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6507f3b4da461e21f3d784428c6d9137017ae5dc;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 6507f3b4da461e21f3d784428c6d9137017ae5dc