From: Philipp Dallig Date: Fri, 12 Aug 2016 09:23:26 +0000 (+0200) Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git X-Git-Tag: v0.1.0~4319 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=14d919b8ec8dc9b74d07fcd202b8466530bce362;p=pixelpark%2Fhiera.git Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git --- 14d919b8ec8dc9b74d07fcd202b8466530bce362