From: Philipp Dallig Date: Wed, 18 Jan 2017 13:18:11 +0000 (+0100) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~3578 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1d5a294e9ee557b54fce1bd7b3716cb5727f674e;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 1d5a294e9ee557b54fce1bd7b3716cb5727f674e