]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
projects / pixelpark / hiera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78dcc8d 02ee7b2)
Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
authorsamuel.bufe <samuel.bufe@publicispixelpark.de>
Tue, 9 Feb 2016 12:50:13 +0000 (13:50 +0100)
committersamuel.bufe <samuel.bufe@publicispixelpark.de>
Tue, 9 Feb 2016 12:50:13 +0000 (13:50 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.