diff options
| author | Ask Solem <ask@celeryproject.org> | 2013-09-10 14:53:36 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2013-09-10 14:53:36 +0100 |
| commit | ef4062681877811734e6cb3aaf087016f9eb53f4 (patch) | |
| tree | 392332465013beff9fef4258448b7b8f580748eb /AUTHORS | |
| parent | 91c6cd6cb50eddf065431930da96716ac751f9cd (diff) | |
| parent | d36af8e23708753cff1bdc2719fa99837d2f6eee (diff) | |
| download | kombu-ef4062681877811734e6cb3aaf087016f9eb53f4.tar.gz | |
Merge branch '2.5'
Conflicts:
Changelog
README.rst
kombu/__init__.py
kombu/messaging.py
kombu/mixins.py
kombu/tests/test_serialization.py
kombu/tests/utilities/test_encoding.py
kombu/transport/filesystem.py
kombu/transport/pyamqp.py
requirements/default.txt
setup.py
tox.ini
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -20,6 +20,7 @@ C Anthony Risinger <anthony+corvisa.com@xtfx.me> Christophe Chauvet <christophe.chauvet@gmail.com> Christopher Grebs <cg@webshox.org> Clay Gerrard <clay.gerrard@gmail.com> +Corentin Ardeois <cardeois@iweb.com> Dan LaMotte <lamotte85@gmail.com> Dan McGee <dan@archlinux.org> Dane Guempel <daneguempel@gmail.com> @@ -71,6 +72,7 @@ Rob Ottaway <robottaway@gmail.com> Rumyana Neykova <rumi.neykova@gmail.com> Rune Halvorsen <runeh@opera.com> Ryan Petrello <lists@ryanpetrello.com> +Sascha Peilicke <saschpe@gmx.de> Scott Lyons <scottalyons@gmail.com> Sean Bleier <sebleier@gmail.com> Sean Creeley <sean.creeley@gmail.com> |