From: Vincent Le Gallic Date: Sun, 18 Aug 2013 11:13:22 +0000 (+0200) Subject: Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers... X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=210eee338643d5734ab408ba2d2d2a004b469793;p=config-20-100.git Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso Conflicts: .procmail/rc/ML_perso --- 210eee338643d5734ab408ba2d2d2a004b469793