]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adb0949 4814c2e)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 21 Nov 2011 19:37:33 +0000 (20:37 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 21 Nov 2011 19:37:33 +0000 (20:37 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  klecker does ftp-upcoming

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.