]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git.pixelpark.com:puppet/hiera
authornils.wagner <nils.wagner@pixelpark.com>
Thu, 14 Apr 2016 15:00:28 +0000 (17:00 +0200)
committernils.wagner <nils.wagner@pixelpark.com>
Thu, 14 Apr 2016 15:00:28 +0000 (17:00 +0200)

Trivial merge