[python-fedora/epel7: 2/2] Merge branch 'master' into epel7

[Toshio くらとみ]

commit e93d9edb08daddea7051cf9255b826c105764bce
Merge: 1918c20 e951478
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Aug 8 02:21:21 2014 -0700

    Merge branch 'master' into epel7

 .gitignore         |    1 +
 python-fedora.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---