]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2f92b3 b9902f1)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Mon, 13 Apr 2009 12:58:34 +0000 (13:58 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 13 Apr 2009 12:58:34 +0000 (13:58 +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.