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