Merge branch 'master' into perso

Conflicts:
	.procmailrc

diff --git a/.procmailrc b/.procmailrc
index 01711926adc6634c406ec61539961128fcd256f5..913298a16dfb9e929d27f3c992677d32cc5ccb78 100644 (file)
--- a/.procmailrc
+++ b/.procmailrc
@@ -757,7 +757,7 @@ INCLUDERC="${CONFIGDIR}/custom.high.rules"
 
 # La ML paiements@
 :0
-* ^List--Id:.*paiements\.lists\.crans\.org
+* ^List-Id:.*paiements\.lists\.crans\.org
 ${PAIEMENTSDIR}/