projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba65c0a 9e768f1)
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Tue, 29 Mar 2011 19:12:11 +0000 (20:12 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 29 Mar 2011 19:12:11 +0000 (20:12 +0100)
1  2 
modules/debian-org/misc/local.yaml patch | diff1 | diff2 | blob | history

diff --cc modules/debian-org/misc/local.yaml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.