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

[Matthias Runge]

commit 35b18681fd4c5fddbd18eb79567d1834affe4cc9
Merge: 39de635 ab45d3c
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Jul 8 18:14:42 2014 +0200

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

 python-tox.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-tox.spec
index ee7b94b,ed1f6c4..074382c
--- a/python-tox.spec
+++ b/python-tox.spec
@@@ -120,9 -118,9 +120,12 @@@ TOXENV=py27 %{__python} setup.py tes
  
  
  %changelog
 +* Tue Jul 08 2014 Matthias Runge <mrunge at redhat.com> - 1.7.1-1
 +- update to 1.7.1 (rhbz#111797)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Tue Sep 24 2013 Matthias Runge <mrunge at redhat.com> - 1.6.1-1
  - update to 1.6.1