git://developer.intra2net.com
/
libi2ncommon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b599d4b
64fd0a6
)
Merge remote branch 'origin/spamassassin'
author
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Mon, 10 May 2010 12:12:32 +0000 (14:12 +0200)
committer
Thomas 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