]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a51f209 b71dd4c)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 16 Mar 2011 20:04:31 +0000 (21:04 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 16 Mar 2011 20:04:31 +0000 (21:04 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  geo1 on squeeze
  unger on squeeze
  rietz on squeeze

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.