From ebb2f047c20be12b20012390cdca39dfc08846b9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 03 2014 17:16:47 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index d84799a..7c7d5e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@
 /ksaneplugin-4.11.1.tar.xz
 /ksaneplugin-4.11.2.tar.xz
 /ksaneplugin-4.11.3.tar.xz
+/ksaneplugin-4.11.90.tar.xz
+/ksaneplugin-4.11.95.tar.xz
+/ksaneplugin-4.11.97.tar.xz
+/ksaneplugin-4.12.0.tar.xz
+/ksaneplugin-4.12.1.tar.xz
+/ksaneplugin-4.12.2.tar.xz
diff --git a/ksaneplugin.spec b/ksaneplugin.spec
index a49ccbc..c628f3e 100644
--- a/ksaneplugin.spec
+++ b/ksaneplugin.spec
@@ -1,6 +1,6 @@
 Name:    ksaneplugin
 Summary: KDE sane service 
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -51,6 +51,24 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %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
 
diff --git a/sources b/sources
index caecd16..32cc9c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64de833bb81ae60936820077ce5c98b4  ksaneplugin-4.11.3.tar.xz
+8d5d85eab91fad90518aedf07e6f3c20  ksaneplugin-4.12.2.tar.xz