Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 4 Feb 2011 16:25:31 +0000 (17:25 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 4 Feb 2011 16:25:31 +0000 (17:25 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Remove redundant entry
  Set BatchMode to yes for portforwarder's ssh.  This also implies ServerAliveInterval set to 300


Trivial merge