Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --combined modules/portforwarder/misc/config.yaml
index 13c3310,7ce085d..7014802
--- 1/modules/portforwarder/misc/config.yaml
--- 2/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@@ -5,11 -5,6 +5,11 @@@
  # port on the remote instead of just encoding it in authkeys.
  
  # from host:port to host:port
 +alioth.debian.org:
 +  - source_bind_port: 5441
 +    target_host: samosa.debian.org
 +    target_port: 5441
 +
  master.debian.org:
    - source_bind_port: 5441
      target_host: samosa.debian.org
@@@ -51,6 -46,7 +51,7 @@@ stabile.debian.org
    - source_bind_port: 15433
      target_host: sibelius.debian.org
      target_port: 5433
+     ssh_options: -oAddressFamily=inet
  
  franck.debian.org:
    - source_bind_port: 5443