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

[Pierre-YvesChibon]

commit 5b7429a1f051332bb3d48b6993b49fd155aa203a
Merge: e93d9ed 833a565
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Oct 23 20:26:06 2014 +0200

    Merge branch 'master' into epel7

 108.patch          |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 python-fedora.spec |   12 ++++++++++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---