[python-kombu/f19: 11/11] Merge branch 'f20' into f19

[Matthias Runge]

commit ef772b36c16ce99688523482785d5e947e285b21
Merge: 087f99b 26eca20
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Jan 8 12:29:18 2014 +0100

    Merge branch 'f20' into f19
    
    Conflicts:
    	python-kombu.spec

 .gitignore        |    6 ++++++
 python-kombu.spec |   51 +++++++++++++++++++++++++++++++++++++++++----------
 sources           |    2 +-
 3 files changed, 48 insertions(+), 11 deletions(-)
---
diff --cc python-kombu.spec
index c65a7ad,c8c4d32..114ba5b
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@@ -7,8 -7,9 +7,8 @@@
  %global srcname kombu
  
  Name:           python-%{srcname}
- Version:        2.5.14
- Release:        2%{?dist}
+ Version:        2.5.16
+ Release:        1%{?dist}
 -Epoch:          1
  Summary:        AMQP Messaging Framework for Python
  
  Group:          Development/Languages
@@@ -135,9 -144,27 +144,31 @@@ pop
  %endif # with_python3
  
  %changelog
 -* Wed Jan 08 2014 Matthias Runge <mrunge at redhat.com> - 1:2.5.16 -1
 -- revert to version 2.5.16, introduce epoch (related rhbz #102826)
++* Wed Jan 08 2014 Matthias Runge <mrunge at redhat.com> - 2.5.16 -1
++- update to version 2.5.16
++
 +* Tue Dec 10 2013 Matthias Runge <mrunge at redhat.com> - 2.5.14-2
 +- fix requirements python-anyjson, python-amqp
  
+ * Sat Nov 16 2013 Fabian Affolter <mail at fabian-affolter.ch> - 3.0.4-1
+ - Updated to latest upstream version 3.0.4 (rhbz#1024916)
+ 
+ * Fri Nov 15 2013 Fabian Affolter <mail at fabian-affolter.ch> - 3.0.3-1
+ - Updated to latest upstream version 3.0.3 (rhbz#1024916)
+ 
+ * Sun Nov 03 2013 Fabian Affolter <mail at fabian-affolter.ch> - 3.0.2-1
+ - Updated to latest upstream version 3.0.2 (rhbz#1024916)
+ 
+ * Mon Oct 28 2013 Fabian Affolter <mail at fabian-affolter.ch> - 3.0.1-1
+ - Updated to latest upstream version 3.0.1 (rhbz#1019148)
+ 
+ * Mon Oct 14 2013 Matthias Runge <mrunge at redhat.com> - 2.5.15-2
+ - enable tests for python2
+ 
+ * Mon Oct 14 2013 Matthias Runge <mrunge at redhat.com> - 2.5.15-1
+ - updated to 2.5.15 (rhbz#1016271)
++>>>>>>> f20
+ 
  * Sun Aug 25 2013 Fabian Affolter <mail at fabian-affolter.ch> - 2.5.14-1
  - Updated to latest upstream version 2.5.14 (rhbz#1000696)