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

[Nathanael Noblet]

commit af33d99276f498c589fffebcf5b49aa6903c2dfc
Merge: 824bd8b 5ca863f
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:25:45 2010 -0600

    Merge remote branch 'origin/master' into f12/master

 dspam-3.9.0-file-name.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 dspam-cron                  |    8 +++---
 dspam.spec                  |    8 ++++++-
 3 files changed, 58 insertions(+), 5 deletions(-)
---