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)
commit2c1abfc905c6a96c09cb8f7064fd04cc82a9cb00
tree442795d6de0d3e5fd0d17ba128fd9189b2547c4d
parent41e2e3de82a9b08e951286f30cb30b443a290529
parent8ad6e90591e0369fc6b2955a1fc687f840277eeb
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