From: Vincent Le Gallic <legallic@crans.org>
Date: Thu, 3 Mar 2016 01:27:27 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=824a2c74d770cb32f0735d1b83b31d24789130c6;hp=93ad74edb3c613f83fbc46cfff323fd7b0738f55;p=config-20-100.git

Merge branch 'master' into perso

Conflicts:
	.procmailrc
---

diff --git a/.procmailrc b/.procmailrc
index 0171192..913298a 100644
--- 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}/