From: nils.wagner <nils.wagner@pixelpark.com>
Date: Tue, 22 Mar 2016 09:22:47 +0000 (+0100)
Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera
X-Git-Tag: v0.1.0~5111
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a7da982f30c24a75379c3fc5981f1c286a8fb949;p=pixelpark%2Fhiera.git

Merge branch 'master' of git.pixelpark.com:puppet/hiera
---

a7da982f30c24a75379c3fc5981f1c286a8fb949