projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f7679f b507681)
Merge branch 'ferm'
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 18 Jan 2010 20:15:06 +0000 (21:15 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 18 Jan 2010 20:15:06 +0000 (21:15 +0100)
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.