Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-tox

Conflicts: python-tox.spec
11 years ago · 35b18681fd
parent 39de63570b ab45d3c2ff
commit 35b18681fd
1 changed files with 3 additions and 0 deletions
--- a/python-tox.spec
+++ b/python-tox.spec
@ -123,6 +123,9 @@ TOXENV=py27 %{__python} setup.py test
 * Tue Jul 08 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-1
 - update to 1.7.1 (rhbz#111797)

+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Tue Sep 24 2013 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
 - update to 1.6.1