From 057547654a7c280f4ddf2c79eda77ea241b3442c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 03 2014 18:30:48 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 0926f03..328e8a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@
 /sweeper-4.11.1.tar.xz
 /sweeper-4.11.2.tar.xz
 /sweeper-4.11.3.tar.xz
+/sweeper-4.11.90.tar.xz
+/sweeper-4.11.95.tar.xz
+/sweeper-4.11.97.tar.xz
+/sweeper-4.12.0.tar.xz
+/sweeper-4.12.1.tar.xz
+/sweeper-4.12.2.tar.xz
diff --git a/sources b/sources
index 6e69fdc..fc44245 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a15ac2ba20c4cd0ff32c677728b87e9  sweeper-4.11.3.tar.xz
+9417e4b8bada66eb7647d54f7a31a387  sweeper-4.12.2.tar.xz
diff --git a/sweeper.spec b/sweeper.spec
index 24800e9..410bb33 100644
--- a/sweeper.spec
+++ b/sweeper.spec
@@ -1,6 +1,6 @@
 Name:    sweeper 
 Summary: Clean unwanted traces the user leaves on the system 
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -66,6 +66,24 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.des
 
 
 %changelog
+* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-1
+- 4.12.2
+
+* Fri Jan 10 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.1-1
+- 4.12.1
+
+* Thu Dec 19 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.12.0-1
+- 4.12.0
+
+* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.97-1
+- 4.11.97
+
+* Thu Nov 21 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.95-1
+- 4.11.95
+
+* Sat Nov 16 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.90-1
+- 4.11.90
+
 * Sat Nov 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.3-1
 - 4.11.3