projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 020f46a 41b4970)
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@ftbfs.de>
Wed, 8 Jul 2009 22:00:58 +0000 (00:00 +0200)
committerMartin Zobel-Helas <zobel@ftbfs.de>
Wed, 8 Jul 2009 22:00:58 +0000 (00:00 +0200)
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.