[conntrack-tools: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/conntrack-tools

[Paul Komkoff]

commit 4490a9f031f6f12cdd9f5fde36085bce9cc767a4
Merge: 282137a 62bb220
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sat Sep 7 20:46:56 2013 +0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/conntrack-tools
    
    Conflicts:
    	conntrack-tools.spec

 conntrack-tools.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc conntrack-tools.spec
index e5e0d55,311556b..1140978
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@@ -82,9 -82,9 +82,12 @@@ if [ $1 -ge 1 ] ; the
  fi
  
  %changelog
 +* Sun Mar 24 2013 Paul P. Komkoff Jr <i at stingr.net> - 1.4.1-1
 +- new upstream version
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Fri Feb 08 2013 Paul Komkoff <i at stingr.net> - 1.4.0-2
  - fix bz#909128