# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1329570536 -7200
# Node ID c15b2b668c00fbff17a67af8b9bafa7f35bc9e60
# Parent  d1a4574fa53407b05f46ddff3280364b6a48125f# Parent  43cce0f0dae37aa84a32ab4bfe34a8a0e9f08c4d
merged

diff -r 43cce0f0dae3 -r c15b2b668c00 .ssh/config
--- a/.ssh/config	Wed Feb 15 01:13:41 2012 +0200
+++ b/.ssh/config	Sat Feb 18 15:08:56 2012 +0200
@@ -1,9 +1,12 @@
+
+Host *
 
 # Allow sharing of multiple sessions over a single network connection for all
 # host. Also don't prompt for password when connection live.
-Host *
-ControlPath ~/.ssh/sock_%r@%h_%p
-ControlMaster auto
+# This option was disabled to simplify use of port forwarding.
+# You can enable it and pass "-s none" to ssh.
+# ControlPath ~/.ssh/sock_%r@%h_%p
+# ControlMaster auto
 
 # This by default.
 # UserKnownHostsFile ~/.ssh/known_hosts