]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
authortobias.kostyra <tobias.kostyra@pixelpark.com>
Fri, 16 Dec 2016 17:19:23 +0000 (18:19 +0100)
committertobias.kostyra <tobias.kostyra@pixelpark.com>
Fri, 16 Dec 2016 17:19:23 +0000 (18:19 +0100)

Trivial merge