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

Conflicts:
	conntrack-tools.spec
This commit is contained in:
Paul P. Komkoff Jr 2011-05-05 14:30:50 +04:00
commit c024b46d4f

View File

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