[dspam/f14: 2/2] Merge branch 'f15' into f14

[Nathanael Noblet]

commit 671b9287da320e38630969afe68609a00090e3f4
Merge: 8529418 80d3de4
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Aug 3 11:38:22 2011 -0600

    Merge branch 'f15' into f14

 dspam-3.9.0-file-name.patch |   47 -------------------------------------------
 dspam.spec                  |   12 ++++++----
 2 files changed, 7 insertions(+), 52 deletions(-)
---