]> git.donarmstrong.com Git - dsa-puppet.git/commit
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)
commitc2d7c2c6141a812e63429f94827d8c99b3e1deac
tree4f667f714641ee14211f08080190fd1cf48d0a05
parent177d067c58cc845ec47c567b333b58b2e0bee493
parent174b184a00d6435c723b51159c91aa173e99c7ca
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* '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/