projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7adf91 bd3abb2)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 19:27:32 +0000 (21:27 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 19:27:32 +0000 (21:27 +0200)
1  2 
manifests/site.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/site.pp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.