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;hp=fc7e6815d113198f0a545ed4b43c2169250464e3;p=config-20-100.git Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso Conflicts: .procmail/rc/ML_perso --- diff --git a/.procmailrc b/.procmailrc index b8f3c75..8909a23 100644 --- a/.procmailrc +++ b/.procmailrc @@ -890,6 +890,10 @@ INCLUDERC="${CONFIGDIR}/custom.normal.rules" :0 * ^List-Id:.*lists.federez.net { + :0 + * ^Subject:.*Logwatch for.*federez\.net + ${FEDEREZLOGWATCHDIR}/ + :0 ${FEDEREZDIR}.${ML_}/ }