]> 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, 24 Mar 2016 15:19:47 +0000 (16:19 +0100)
committernils.wagner <nils.wagner@pixelpark.com>
Thu, 24 Mar 2016 15:19:47 +0000 (16:19 +0100)

Trivial merge