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


---

diff --git a/.gitignore b/.gitignore
index b24de46..22c9397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,9 @@
 /krdc-4.11.1.tar.xz
 /krdc-4.11.2.tar.xz
 /krdc-4.11.3.tar.xz
+/krdc-4.11.90.tar.xz
+/krdc-4.11.95.tar.xz
+/krdc-4.11.97.tar.xz
+/krdc-4.12.0.tar.xz
+/krdc-4.12.1.tar.xz
+/krdc-4.12.2.tar.xz
diff --git a/krdc.spec b/krdc.spec
index 7d80725..f60047a 100644
--- a/krdc.spec
+++ b/krdc.spec
@@ -1,7 +1,7 @@
 
 Name:    krdc
 Summary: Remote desktop client
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
@@ -131,6 +131,24 @@ fi
 
 
 %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 e776afe..455a168 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f184dd31425b2128bd2db9b29fc149f6  krdc-4.11.3.tar.xz
+85ad6c1c78e7dbd9f2dca3e5848dad69  krdc-4.12.2.tar.xz