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


---

diff --git a/kdeedu.spec b/kdeedu.spec
index bd7eef5..879eb55 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -1,7 +1,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
  
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -77,6 +77,24 @@ Requires: rocs >= %{version}
 
 
 %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