commit cdc77fe7931329e486d470738a88eb42a657ebb2
Merge: 0ebdcd2 13b6e5f
Author: Nathanael D. Noblet
Date: Wed Jan 26 14:10:30 2011 -0700
Merge remote branch 'origin/master' into el6/master
dspam-web.conf |3 ++-
dspam.spec |5 -
2 files changed, 6 insertions(+), 2 deletions
commit 45fc273422f73284235aed4c99a655f5e3273445
Merge: 82a2e8d 5ca863f
Author: Nathanael d. Noblet
Date: Wed Sep 22 10:30:00 2010 -0600
Merge remote branch 'origin/master' into el6/master
Conflicts:
dspam.spec
dspam-3.9.0-file-name.patch | 47 +++
