Merge branch 'master' into perso

Conflicts:
	.ssh/config

diff --git a/.ssh/config b/.ssh/config
index ab52ddfdcec44a5cdb3b41376709c69c23fb6b89..03a66cae94ee80af55104ef88caaf399003eaf60 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -1015,6 +1015,12 @@ Host *.dptinfo
     ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p
     ForwardAgent yes
 
+Host *.dptinfo.ens-cachan.fr
+    HostName %h
+    User vlegalli
+    ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
+    ForwardAgent yes
+
 
 # +--------+
 # | Stages |