]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers...
authorVincent Le Gallic <legallic@crans.org>
Sun, 18 Aug 2013 11:13:22 +0000 (13:13 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sun, 18 Aug 2013 11:13:22 +0000 (13:13 +0200)
Conflicts:
.procmail/rc/ML_perso

1  2 
.procmailrc

diff --cc .procmailrc
Simple merge