[python-trollius/el6: 4/4] Merge branch 'master' into el6

[Ian Wienand]

commit 4c2e83136f496a67e7741d9c3f4090976721612e
Merge: 95dacfa b20d7e3
Author: Ian Wienand <iwienand at redhat.com>
Date:   Mon Jul 7 14:27:53 2014 +1000

    Merge branch 'master' into el6

 .gitignore           |    1 +
 python-trollius.spec |   11 ++++++++---
 sources              |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---