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

Conflicts:
	conntrack-tools.spec
This commit is contained in:
Paul P. Komkoff 2013-09-07 20:46:56 +04:00
commit 4490a9f031

View File

@ -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