merged up to 483091 using 'svn merge -r478920:483091 https://svn.apache.org/repos/asf/spamassassin/trunk'

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/jm_re2c_hacks@483095 13f79535-47bb-0310-9956-ffa450edef68
32 files changed