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

[Matej Cepl]

commit ade49dac024fe4380a05a4221e0e1e79ae38b357
Merge: c2cebf9 792773b
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Apr 29 21:36:51 2014 +0200

    Merge branch 'master' into epel7
    
    Conflicts:
    	python-mccabe.spec

 python-mccabe.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc python-mccabe.spec
index b8026f9,f03c516..6240c00
--- a/python-mccabe.spec
+++ b/python-mccabe.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name:               python-mccabe
  Version:            0.2.1
--Release:            3%{?dist}
++Release:            4%{?dist}
  Summary:            McCabe complexity checker
  
  Group:              Development/Libraries
@@@ -89,9 -89,9 +89,12 @@@ pop
  %endif
  
  %changelog
- * Tue Apr 29 2014 Matěj Cepl <mcepl at redhat.com> - 0.2.1-3
++* Tue Apr 29 2014 Matěj Cepl <mcepl at redhat.com> - 0.2.1-4
 +- Fix building on RHEL-7 (we really don’t have Python3)
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Mon Apr 15 2013 Matěj Cepl <mcepl at redhat.com> 0.2.1-2
  - Fix %%changelog.