[dspam/f16] bump upstream version

[Nathanael Noblet]

commit b0203d52c02e2defe505d371638313a2df3c10a5
Author: Nathanael D. Noblet <nathanael(a)gnat.ca&gt;
Date:   Wed May 2 09:39:02 2012 -0600

    bump upstream version

 .gitignore |    1 +
 dspam.spec |    8 ++++++++
 sources    |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c04f94d..3916ccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 dspam-3.9.0.tar.gz
 dspam-3.10.0.tar.gz
 /dspam-3.10.1.tar.gz
+/dspam-3.10.2.tar.gz
diff --git a/dspam.spec b/dspam.spec
index a70fb65..94daf7c 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -10,8 +10,13 @@
 
 Summary:                A library and Mail Delivery Agent for Bayesian SPAM filtering
 Name:                   dspam
+<<<<<<< HEAD
 Version:                3.10.1
 Release:                6%{?dist}
+=======
+Version:                3.10.2
+Release:                1%{?dist}
+>>>>>>> 7accda0... bump upstream version
 License:                GPLv2
 Group:                  System Environment/Daemons
 Source0:               
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -375,6 +380,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
 
 %changelog
+* Wed May 2 2012 Nathanael Noblet <nathanael(a)gnat.ca&gt; - 3.10.2-1
+- New upstream release
+
 * Thu Feb 23 2012 Nathanael Noblet <nathanael(a)gnat.ca&gt; - 3.10.1-6
 - Change default server port to 10024 so dspam starts up by default
 
diff --git a/sources b/sources
index 57ed40b..58fd81e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8b57f7f4ce31de86fa13a656d3bf936  dspam-3.10.1.tar.gz
+0e0e405d3284485b2a43f47eaf6b09bb  dspam-3.10.2.tar.gz