From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Fri, 7 Feb 2020 14:48:13 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 2.4~80^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71386001dddd8f681da1a5780ad91fa8f190938a;p=thirdparty%2Frspamd.git

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

71386001dddd8f681da1a5780ad91fa8f190938a