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

[Matthias Runge]

commit 2be375dd9de2d202426769aa2752bcf10eb01274
Merge: 1ced160 5a1f07c
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Feb 26 15:22:06 2014 +0100

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

 python-pep8.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc python-pep8.spec
index 9e1edce,aa758cd..06b9207
--- a/python-pep8.spec
+++ b/python-pep8.spec
@@@ -110,8 -112,8 +112,9 @@@ pop
  %endif
  
  %changelog
- * Wed Feb 26 2014 Matthias Runge <mrunge at redhat.com> -1.4.6-1 
+ * Wed Feb 26 2014 Matthias Runge <mrunge at redhat.com> -1.4.6-2
+ - rename py3 version of pep8 to python3-pep8 (rhbz#1060408)
 +- built for epel7
  
  * Tue Aug 13 2013 Ian Weller <iweller at redhat.com> - 1.4.6-1
  - update to 1.4.6