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)
commitf110af11d2b7ce881ab55c00f8f89b52b8066744
tree66ff8bb5d4e4472ed27b96b998f41be12319ae7f
parentb599d4b1cd7cf103f0176ea24561ed8d0fb1f631
parent64fd0a638f0e5221c20904850db0e09291d145a6
Merge remote branch 'origin/spamassassin'

Conflicts:
sarules/50_i2n_dnsbls_scores.cf
sarules/50_i2n_scores.cf
sarules/add_all_internal.patch