From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 1 Jan 2014 16:00:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.6.7~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9a65473e352d23485377ca9f895e2716cd624fe;p=thirdparty%2Frspamd.git

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

b9a65473e352d23485377ca9f895e2716cd624fe