summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-04-15 12:45:25 +0100
committerAsk Solem <ask@celeryproject.org>2013-04-15 12:45:25 +0100
commit970e27db8e5d05a31574f4b90c151832d620f772 (patch)
tree9fe4caa032547ae3b58530281b453da99c1c6814 /AUTHORS
parentadac332fa14fd81273a3af74d477569304b3a3ea (diff)
parent4962da4a19c477bca05bea1eb73d8eb6655f4c5a (diff)
downloadkombu-970e27db8e5d05a31574f4b90c151832d620f772.tar.gz
Merge branch '2.5'
Conflicts: Changelog README.rst kombu/__init__.py kombu/messaging.py kombu/serialization.py kombu/transport/redis.py requirements/default.txt
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions