From d158af8cdfa6e4bf85c1e74769e8d61bc469494c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 10 Dec 2008 18:30:29 +0000
Subject: Merge revisions 36811:36865 from trunk.

svn path=/branches/kill-bonobo/; revision=36867
---
 plugins/sa-junk-plugin/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'plugins/sa-junk-plugin/ChangeLog')

diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index badfbb83ff..46f51c7003 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #560420 (patch by hp@syntomax.com)
+
+	* em-junk-filter.c (pipe_to_sa_full):
+	spamc and spamassassin use error codes >= 64 to denote execution
+	errors.  Positive error codes < 64 means the message was identified
+	as spam.
+
 2008-09-29  Sankar P  <psankar@novell.com>
 
 License Changes
-- 
cgit v1.2.3