Merge branch 'master' of git.puppet.immerda.ch:module-trocla
authormh <mh@immerda.ch>
Sat, 26 Sep 2015 10:02:00 +0000 (12:02 +0200)
committermh <mh@immerda.ch>
Sat, 26 Sep 2015 10:02:00 +0000 (12:02 +0200)
commite6d8b84099ee9764be4b366af6d7823f20f66227
treedbef0b0dd4c7b2d41c131503acbffa8ca61a1c1f
parent402b98284242713fbb7b0173da8aa6eff87fa595
parent505d820e21c46bb578d796a91de1806d22b17549
Merge branch 'master' of git.puppet.immerda.ch:module-trocla