From e6559e856fedf9143da57a7bc7173271faf8b2a5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 09 2012 03:52:54 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	kdf.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 5ca5457..4d4edc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/kdf-4.8.3.tar.xz
-/kdf-4.8.4.tar.xz
 /kdf-4.8.5.tar.xz
+/kdf-4.9.1.tar.xz
diff --git a/kdf.spec b/kdf.spec
index e20a462..6a4a2b7 100644
--- a/kdf.spec
+++ b/kdf.spec
@@ -1,6 +1,6 @@
 Name:    kdf
 Summary: View disk usage
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -88,14 +88,29 @@ 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 Rex Dieter <rdieter@fedoraproject.org> 4.8.4-2
+* 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
+
+* Wed Jun 27 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.95-1
+- 4.8.95
+
+* Sun Jun 10 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
+
+* Tue Jun 05 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.80-2
 - fix %%_kde_version macro usage
 
-* Mon Jun 04 2012 Than Ngo <than@redhat.com> - 4.8.4-1
-- 4.8.4
+* 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 57aae2f..bada218 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e080cf9e6e54ac848b7e8e25869e906  kdf-4.8.5.tar.xz
+c9195e0e9665a1314c791008bcf9155b  kdf-4.9.1.tar.xz