From: Philipp Dallig Date: Wed, 30 Mar 2016 10:21:46 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~5078 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9abd8959493c4c5d455d5442f767cf816716a4e0;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 9abd8959493c4c5d455d5442f767cf816716a4e0