Merge tag 'upstream/0.4.0' origin/master
authorDon Armstrong <don@donarmstrong.com>
Fri, 7 Aug 2015 03:05:45 +0000 (20:05 -0700)
committerDon Armstrong <don@donarmstrong.com>
Fri, 7 Aug 2015 03:05:45 +0000 (20:05 -0700)
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


Trivial merge