From c024b46d4ff68165ccd55513e209dbf6ac74ad1c Mon Sep 17 00:00:00 2001
From: Paul P. Komkoff Jr <i@stingr.net>
Date: May 05 2011 10:30:50 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/conntrack-tools


Conflicts:
	conntrack-tools.spec

---

diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index af4afeb..0a0f7b4 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 * Thu May  5 2011 Paul P. Komkoff Jr <i@stingr.net> - 1.0.0
 - new upstream version
 
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Nov 19 2010 Paul P. Komkoff Jr <i@stingr.net> - 0.9.15-1
 - new upstream version