Merge branch 'spamfilter-first-trusted' into master
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 27 Aug 2009 08:13:15 +0000 (10:13 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 27 Aug 2009 08:13:15 +0000 (10:13 +0200)
commited35743ac73331abe0d2e159cacc702847bbb057
tree1074a83cebe9d95bce69b371471231e897b0d736
parentf75adcbe74dab64a5fde06d00c5939008b35f2dc
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