diff options
author | mh <mh@immerda.ch> | 2014-09-13 05:16:18 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-09-13 05:16:18 +0200 |
commit | ec4e2ba4f6f90116927ead35fca8c525a64a9e57 (patch) | |
tree | ceb5f922aa89f92666c4086e71febab6a122b980 /manifests/init.pp | |
parent | 39eb7ac31ad7f1fc16c37c42823fb1860c1f09ba (diff) | |
parent | ee32ce830d98b38f68293a648ca7dd83fde14422 (diff) |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b015521..54b489b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,7 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # # Copyright 2008, Puzzle ITC GmbH -# Marcel Härry haerry+puppet(at)puzzle.ch +# Marcel Haerry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # # This program is free software; you can redistribute |