From: Philipp Dallig Date: Tue, 7 Jun 2016 14:47:57 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4712^2~33 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=25eb26a06ab71cc74fcd9217b8d342e5e83a8096;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 25eb26a06ab71cc74fcd9217b8d342e5e83a8096