From bc5c2e059bd26f24b80083ac52cfacf71ea2eb98 Mon Sep 17 00:00:00 2001
From: Paul P. Komkoff <i@stingr.net>
Date: Nov 29 2012 23:14:26 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/libnfnetlink


Conflicts:
	libnfnetlink.spec

---

diff --git a/libnfnetlink.spec b/libnfnetlink.spec
index eab5841..c082ac5 100644
--- a/libnfnetlink.spec
+++ b/libnfnetlink.spec
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Nov 30 2012 Paul Komkoff <i@stingr.net> - 1.0.1-1
 - new upstream version
 
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild