From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Mon, 10 May 2010 12:12:32 +0000 (+0200)
Subject: Merge remote branch 'origin/spamassassin'
X-Git-Tag: v2.6~109
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=f110af11d2b7ce881ab55c00f8f89b52b8066744;p=libi2ncommon

Merge remote branch 'origin/spamassassin'

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

f110af11d2b7ce881ab55c00f8f89b52b8066744