]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Wed, 29 Jan 2014 01:35:38 +0000 (02:35 +0100)
committerVincent Le Gallic <legallic@crans.org>
Wed, 29 Jan 2014 01:35:38 +0000 (02:35 +0100)
1  2 
.procmailrc

diff --cc .procmailrc
Simple merge