From: Philipp Dallig Date: Thu, 25 Feb 2016 13:39:32 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5299 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=64e740c4d87a3950ec978f3618da27178c3d150a;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 64e740c4d87a3950ec978f3618da27178c3d150a