From: Vincent Le Gallic Date: Mon, 23 Nov 2015 00:44:22 +0000 (+0100) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=f886ab6eaf7791beb0d1070c3ac5a34dab2e0c49;p=config-20-100.git Merge branch 'master' into perso Conflicts: .ssh/config --- f886ab6eaf7791beb0d1070c3ac5a34dab2e0c49