From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 17 Feb 2013 20:19:09 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c2d7c2c6141a812e63429f94827d8c99b3e1deac;p=mirror%2Fdsa-puppet.git

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

c2d7c2c6141a812e63429f94827d8c99b3e1deac