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)
commitb22631bbcb3adc2f8bb05b05e3414456cdb68f01
tree38a6f353b9ad56b967ee93cd814fab21578ba504
parent44a24564e5d5a0c83330cfd66ce4517520e04dad
parentd665197bdd18c8ef6a59c466f162de630eb9218d
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:
  Remove redundant entry
  Set BatchMode to yes for portforwarder's ssh.  This also implies ServerAliveInterval set to 300