From 4490a9f031f6f12cdd9f5fde36085bce9cc767a4 Mon Sep 17 00:00:00 2001
From: Paul P. Komkoff <i@stingr.net>
Date: Sep 07 2013 16:46:56 +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 e5e0d55..1140978 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -85,6 +85,9 @@ fi
 * Sun Mar 24 2013 Paul P. Komkoff Jr <i@stingr.net> - 1.4.1-1
 - new upstream version
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Feb 08 2013 Paul Komkoff <i@stingr.net> - 1.4.0-2
 - fix bz#909128