Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers...

Conflicts:
	.procmail/rc/ML_perso

diff --combined .procmailrc
index 711cab12bbedda4d31127096eb0bb211dfa97181,b8f3c75cd043094a24546ed0e1c22e4273d50f77..8909a231011f03df4f645ea7d7bef9b11647ee13
--- 1/.procmailrc
--- 2/.procmailrc
+++ b/.procmailrc
@@@ -412,6 -412,10 +412,10 @@@ INCLUDERC="${CONFIGDIR}/custom.high.rul
    * ^Subject:.*monit \/[^ \.]+
    ${MONITDIR}.${MATCH}/
    
+   :0
+   * ^Subject:.*logwatch for
+   ${MONITDIR}.${MATCH}/
+   
    # Dossier de Monit par défaut, si Monit se met à envoyer d'autres mails
    :0
    ${MONITDIR}/
@@@ -886,10 -890,6 +890,10 @@@ INCLUDERC="${CONFIGDIR}/custom.normal.r
    :0
    * ^List-Id:.*lists.federez.net
    {
 +    :0
 +    * ^Subject:.*Logwatch for.*federez\.net
 +    ${FEDEREZLOGWATCHDIR}/
 +    
      :0
      ${FEDEREZDIR}.${ML_}/
    }