[python-celery/f20: 2/2] Merge branch 'f19' into f20

[Matthias Runge]

commit 79c82217e40d579a3344308218b94a8c01317b7a
Merge: 4439ed1 e18ff7d
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Sep 6 11:40:01 2013 +0200

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

 python-celery.spec |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)
---
diff --cc python-celery.spec
index 2014835,0c3312f..771eb34
--- a/python-celery.spec
+++ b/python-celery.spec
@@@ -158,13 -178,11 +178,17 @@@ pop
  
  
  %changelog
+ * Fri Sep 06 2013 Matthias Runge <mrunge at redhat.com> - 3.0.15-2
+ - fix requirements: python3-kombu, python3-pytz, python3-dateutil and billiard
+ - separate binaries for py3 and py
+ 
 +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.19-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
 +* Tue Apr 23 2013 Matthias Runge <mrunge at redhat.com> - 3.0.19-1
 +- update to celery-3.0.19 (rhbz#919560)
 +
- * Fri Feb 14 2013 Matthias Runge <mrunge at redhat.com> - 3.0.15-1
+ * Fri Feb 15 2013 Matthias Runge <mrunge at redhat.com> - 3.0.15-1
  - update to celery-3.0.15 (rhbz#909919)
  
  * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.13-2