From 42a769e5f2009858c0fed992ae90bac460534f52 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mar 04 2013 19:13:41 +0000
Subject: Merge branch 'master' into f18


Conflicts:
	kdeedu.spec

---

diff --git a/kdeedu.spec b/kdeedu.spec
index 0847424..b97a8e7 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -1,7 +1,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
  
-Version: 4.9.5
+Version: 4.10.1
 Release: 1%{?dist}
 
 License: GPLv2
@@ -77,11 +77,23 @@ Requires: rocs >= %{version}
 
 
 %changelog
-* Sat Dec 29 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.5-1
-- 4.9.5
+* Sat Mar 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.1-1
+- 4.10.1
 
-* Wed Dec 05 2012 Than Ngo <than@redhat.com> - 4.9.4-1
-- 4.9.4
+* Fri Feb 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.0-1
+- 4.10.0
+
+* Tue Jan 22 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.9.98-1
+- 4.9.98
+
+* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.9.97-1
+- 4.9.97
+
+* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.95-1
+- 4.9.95
+
+* Tue Dec 04 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.90-1
+- 4.9.90
 
 * Sat Nov 03 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.3-1
 - 4.9.3