[dspam/f13/master: 2/2] Merge remote branch 'origin/master' into f13/master

[Nathanael Noblet]

commit e616dc4543f35bfbc5bd9806d7710f54437e9768
Merge: bb52d36 5ca863f
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:18:51 2010 -0600

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	dspam.spec

 dspam-3.9.0-file-name.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 dspam-cron                  |    8 +++---
 dspam.spec                  |   11 +++++++++-
 3 files changed, 61 insertions(+), 5 deletions(-)
---
diff --cc dspam.spec
index 9872151,5b50f55..6510d58
--- a/dspam.spec
+++ b/dspam.spec
@@@ -359,12 -361,10 +361,19 @@@ exit 
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
  
  %changelog
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +* Tue Jul 13 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-7
 +- Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
 +
 +* Wed Mar 3 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-6
 +=======
++=======
+ * Wed Sep 22 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-9
+ - Update cron job to be silent on success
+ - Patch hash utils
+ 
++>>>>>>> origin/master
  * Tue Jul 13 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-8
  - Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)