[python-tox/f20: 2/2] Merge branch 'f21' into f20

[Matthias Runge]

commit acd6a5049f3cc9f66ecce5a26bf1023f752ddaee
Merge: 0492cc2 6683010
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Aug 13 22:04:46 2014 +0200

    Merge branch 'f21' into f20

 python-tox-Fix-command-expansion-and-parsing.patch |   93 ++++++++++++++++++++
 python-tox.spec                                    |   10 ++-
 2 files changed, 102 insertions(+), 1 deletions(-)
---