From: nils.wagner <nils.wagner@pixelpark.com>
Date: Mon, 11 Apr 2016 12:51:12 +0000 (+0200)
Subject: Merge branch 'master' of git.pixelpark.com:puppet/hiera
X-Git-Tag: v0.1.0~5029
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9435ef07e262e3ae0890301b8fda72c1668270c3;p=pixelpark%2Fhiera.git

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

9435ef07e262e3ae0890301b8fda72c1668270c3