From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Fri, 28 Feb 2020 17:58:17 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 2.5~106^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fee3538325652383a2d79dd12095f3bef263ab9e;p=thirdparty%2Frspamd.git

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

fee3538325652383a2d79dd12095f3bef263ab9e