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/?p=config-20-100.git;a=commitdiff_plain;h=824a2c74d770cb32f0735d1b83b31d24789130c6

Merge branch 'master' into perso

Conflicts:
	.procmailrc
---

824a2c74d770cb32f0735d1b83b31d24789130c6