From 6be6212a327025fb9ba26d82478ff641388046f5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Oct 12 2014 03:26:10 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 4b23872..6c1d609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /kwalletmanager-4.13.97.tar.xz
 /kwalletmanager-4.14.0.tar.xz
 /kwalletmanager-4.14.1.tar.xz
+/kwalletmanager-4.14.2.tar.xz
diff --git a/kwalletmanager.spec b/kwalletmanager.spec
index 584981e..2f5157e 100644
--- a/kwalletmanager.spec
+++ b/kwalletmanager.spec
@@ -1,6 +1,6 @@
 Name:    kwalletmanager
 Summary: Manage KDE passwords
-Version: 4.14.1
+Version: 4.14.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -83,6 +83,9 @@ fi
 
 
 %changelog
+* Sun Oct 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.2-1
+- 4.14.2
+
 * Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.1-1
 - 4.14.1
 
diff --git a/sources b/sources
index 0bcfc60..23840bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29df1792c4b30739e5c33322481f3d56  kwalletmanager-4.14.1.tar.xz
+5372b85c6a7de3062ce0ca459df58ed5  kwalletmanager-4.14.2.tar.xz