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

Merge tag 'upstream/0.4.0'

Upstream version 0.4.0

Conflicts:
	ChangeLog
	Makefile.in
	README
	aclocal.m4
	config.guess
	config.sub
	configure
	configure.in
	contrib/spamass-milter
	contrib/spamass-milter.spec
	install-sh
	missing
	spamass-milter.1.in
	spamass-milter.cpp
	spamass-milter.h
---

2c1abfc905c6a96c09cb8f7064fd04cc82a9cb00