From: Carsten Rosenberg <c.rosenberg@heinlein-support.de>
Date: Tue, 20 Mar 2018 13:38:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.7.2~30^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=041b5460c9779eacbdd47bf7c31fc6ed09ac101f;p=thirdparty%2Frspamd.git

Merge remote-tracking branch 'upstream/master'
---

041b5460c9779eacbdd47bf7c31fc6ed09ac101f