Merge branch 'master' into perso

Conflicts:
	.ssh/config

diff --cc .procmailrc
Simple merge

diff --cc .ssh/config
index 948571eb0721dc0dd5e37e01b0874663864d758e,cee0f71bbe5f5fd92fce694ef092289b7f7ffdbc..04f9bd22414209bdc4006a38a9280737df7d145a
--- 1/.ssh/config
--- 2/.ssh/config
+++ b/.ssh/config
@@@ -864,7 -718,8 +864,8 @@@ Host hexagon hexagon.federez.ne
  
  Host tselin tselin.clietu tselin.clietu.ens-cachan.fr acces1.rip.ens-cachan.fr acces1 rip
      HostName tselin.clietu.ens-cachan.fr
 -    User loginENS
 -    ProxyCommand ssh loginENS@tahines.ens-cachan.fr -W %h:%p
 +    User vlegalli
++    ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
  
  Host tahines.ens-cachan.fr tahines2 tahines
      HostName tahines.ens-cachan.fr