[python-flake8: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-flake8

[Matthias Runge]

commit 43d50cb0e2b228fd5dd2ea3a7dfba8f655c0cf97
Merge: f3c406b bb54326
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Oct 20 11:41:29 2014 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-flake8
    
    Conflicts:
    	python-flake8.spec

 python-flake8.spec |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --cc python-flake8.spec
index ce47320,67de83a..8e52214
--- a/python-flake8.spec
+++ b/python-flake8.spec
@@@ -154,9 -154,12 +154,16 @@@ pop
  
  
  %changelog
 +* Mon Oct 20 2014 Matthias Runge <mrunge at redhat.com> - 2.2.5-1
 +- update to 2.2.5 (rhbz#1132878)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Wed May 14 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 2.1.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+ 
++
  * Wed Apr 09 2014 Matthias Runge <mrunge at redhat.com> - 2.1.0-1
  - update to 2.1.0