]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Tue, 14 Jun 2016 15:17:34 +0000 (17:17 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Tue, 14 Jun 2016 15:17:34 +0000 (17:17 +0200)

Trivial merge