asf - Revision 1917012: /spamassassin/tags/merged_from_b2_4_0