[python-txws/el6: 7/7] Merge branch 'master' into el6

[Ralph Bean]

commit 53b2ca2a44015d0fdc7192bcf5228dce6ee85b72
Merge: f42fc47 bbdca69
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu May 8 08:54:03 2014 -0400

    Merge branch 'master' into el6

 .gitignore                         |    2 +
 python-txws-drop-vcversioner.patch |   27 ++++++++++
 python-txws.spec                   |  102 +++++++++++++++++++++++++++++++++---
 sources                            |    2 +-
 4 files changed, 125 insertions(+), 8 deletions(-)
---