From: Andrew Lewis <nerf@judo.za.org>
Date: Sun, 15 Feb 2015 20:21:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.9.0~694^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15702a351be151d16f8f0c8eb2bf48595b434484;p=thirdparty%2Frspamd.git

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

15702a351be151d16f8f0c8eb2bf48595b434484