From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 7 Aug 2015 02:59:20 +0000 (-0700)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/0.4.0-1~8
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fspamass-milter.git;a=commitdiff_plain;h=41e2e3de82a9b08e951286f30cb30b443a290529

Merge branch 'upstream'
---

41e2e3de82a9b08e951286f30cb30b443a290529