[python-tox/f20] (4 commits) ...Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-tox

[Matthias Runge]

Summary of changes:

  b16e8f3... update to 1.6.1 (*)
  ab45d3c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  39de635... update to 1.7.1 (rhbz#111797) (*)
  35b1868... Merge branch 'master' of ssh://pkgs.fedoraproject.org/pytho (*)

(*) This commit already existed in another branch; no separate mail sent