Merge branch 'epel7' into el6

Conflicts:
	python-tox.spec

python-tox.spec

@@ -6,15 +6,15 @@
 
 %global pypiname tox
 Name:           python-tox
-Version:        1.4.2
-Release:        8%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
 License:        GPLv2+ and MIT
 URL:            http://codespeak.net/tox
 Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.zip
-#md5=dc52acf22eb57eaa33e704f8a54e7b34
+
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -78,9 +78,16 @@ TOXENV=py27 %{__python} setup.py test
 
 
 %changelog
-* Mon Feb 17 2014 Matthias Runge <mrunge@redhat.com> - 1.4.2-8
+* Mon Oct 13 2014 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
+- update to 1.6.1
+
+* Mon Feb 17 2014 Matthias Runge <mrunge@redhat.com> - 1.4.2-9
 - python 2.6 requires argparse (rhbz#1065824)
 
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+
 * Wed Nov 14 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-7
 - add requires python-py, python-virtualenv (rhbz#876246)