]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 177d067 174b184)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 17 Feb 2013 20:19:09 +0000 (21:19 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 17 Feb 2013 20:19:09 +0000 (21:19 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  udd port from master
  disable master->samosa forward
  s/org/srv/


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.