Merge remote branch 'origin/spamassassin'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 10 May 2010 12:12:32 +0000 (14:12 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 10 May 2010 12:12:32 +0000 (14:12 +0200)
Conflicts:
sarules/50_i2n_dnsbls_scores.cf
sarules/50_i2n_scores.cf
sarules/add_all_internal.patch


Trivial merge