]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git.pixelpark.com:puppet/hiera
authornils.wagner <nils.wagner@pixelpark.com>
Wed, 23 Mar 2016 15:27:14 +0000 (16:27 +0100)
committernils.wagner <nils.wagner@pixelpark.com>
Wed, 23 Mar 2016 15:27:14 +0000 (16:27 +0100)

Trivial merge