From 3336efd1735df7b3904ccdd08f7897a8950edad6 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Oct 27 2011 18:37:56 +0000
Subject: Merge branch 'master' into el5


Conflicts:
	.gitignore
	cacti.spec

---

diff --git a/.gitignore b/.gitignore
index 8aa742c..8a26c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-cacti-0.8.6j.tar.gz
+cacti-0.8.7g.tar.gz
 /cacti-0.8.7h.tar.gz
diff --git a/cacti.spec b/cacti.spec
index beb6be2..ed6b656 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -107,11 +107,15 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Mon Oct 24 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
-- Upstream released new version (#748451)
+* Thu Oct 27 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
+- New upstream release.
+- Remove upstream'd mysql patch.
 
-* Thu May 26 2011 Ken Dreyer <ktdreyer@ktdreyer.com> 0.8.7g-1.el5.1
-- Bump dist for koji.
+* Mon Aug 08 2011 Jon Ciesla <limb@jcomserv.net> - 0.8.7g-3
+- Patch for MySQL 5.5, BZ 728513.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.7g-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Mon Jul 12 2010 Mike McGrath <mmcgrath@redhat.com> 0.8.7g-1
 - Upstream released new version