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

[Nathanael Noblet]

commit 8529418be37c3a202b472854aa24630137b6fcf1
Merge: bda6641 8af1ab0
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jul 13 13:50:38 2011 -0600

    Merge branch 'f15' into f14

 dspam.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---