[rpms/ktouch] epel10: Merge branch 'master' into f17

[rpms/ktouch] epel10: Merge branch 'master' into f17

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/ktouch
            Branch : epel10
            Commit : 6360fa093918cb528273b7467acaa6280c63dbb0
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2012-09-10T07:47:53-05:00
            Stats  : +22/-8 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ktouch/c/6360fa093918cb528273b7467acaa6280c63dbb0?branch=epel10

            Log:
            Merge branch 'master' into f17

Conflicts:
	.gitignore
	ktouch.spec
	sources

---
diff --git a/.gitignore b/.gitignore
index 035a7af..59d19f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/ktouch-4.8.3.tar.xz
-/ktouch-4.8.4.tar.xz
 /ktouch-4.8.5.tar.xz
+/ktouch-4.9.1.tar.xz

diff --git a/ktouch.spec b/ktouch.spec
index 175efb0..40d05bc 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -1,6 +1,6 @@
 Name:    ktouch
 Summary: Touch Typing Tutor 
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -71,11 +71,26 @@ fi
 
 
 %changelog
-* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.5-1
-- 4.8.5
+* Mon Sep 03 2012 Than Ngo <than@redhat.com> - 4.9.1-1
+- 4.9.1
 
-* Tue Jun 05 2012 Than Ngo <than@redhat.com> - 4.8.4-1
-- 4.8.4
+* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.9.0-1
+- 4.9.0
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jul 12 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
+
+* Sun Jun 10 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
+
+* Sun Jun 03 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.80-1
+- 4.8.80
 
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.3-1
 - 4.8.3

diff --git a/sources b/sources
index 53da410..ec7feb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78262d054ee5eb9a89c899ecd631000e  ktouch-4.8.5.tar.xz
+8faaacacf11603023efaf92eec05b8e1  ktouch-4.9.1.tar.xz