From 094fae00cb93aa990bc725cac0d9847de7270b90 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 08 2012 16:58:46 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	kdeedu.spec

---

diff --git a/kdeedu.spec b/kdeedu.spec
index 05c6d67..a3b898b 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -1,7 +1,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
  
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: GPLv2
@@ -23,6 +23,7 @@ Requires: klettres >= %{version}
 Requires: ktouch >= %{version}
 Requires: kturtle >= %{version}
 Requires: kwordquiz >= %{version}
+Requires: pairs >= %{version}
 Requires: parley >= %{version}
 Requires: step >= %{version}
 
@@ -76,8 +77,26 @@ Requires: rocs >= %{version}
 
 
 %changelog
-* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.5-1
-- 4.8.5
+* Wed Sep 05 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.1-1
+- 4.9.1
+
+* Fri Jul 27 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.0-1
+- 4.9.0
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.97-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jul 13 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.97-2
+- +Requires: pairs
+
+* Wed Jul 11 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.97-1
+- 4.8.97
+
+* Thu Jun 28 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.95-1
+- 4.8.95
+
+* Sat Jun 09 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
 
 * Wed Jun 06 2012 Than Ngo <than@redhat.com> - 4.8.4-1
 - 4.8.4