From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Thu, 27 Aug 2009 08:13:15 +0000 (+0200)
Subject: Merge branch 'spamfilter-first-trusted' into master
X-Git-Tag: v2.6~119
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=ed35743ac73331abe0d2e159cacc702847bbb057;p=libi2ncommon

Merge branch 'spamfilter-first-trusted' into master

Conflicts:
	intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.mo
	intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.po
	orga/releasetests/tests-5.1.6.txt
	orga/releasetests/tests-5.1.7.txt
	packages/Mail-SpamAssassin/Mail-SpamAssassin.spec
	packages/logcheck/logcheck-patterns/ignore.d.server/intranator
	sarules/50_i2n_scores.cf
	sarules/i2n-rules.cf
	sarules/ixhash.cf
	sarules/sarules.spec
	update_cnf/src/update_5.1.7.cpp
---