diff options
| author | Ask Solem <ask@celeryproject.org> | 2013-05-14 15:29:48 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2013-05-14 15:29:48 +0100 |
| commit | 415dcc5ff86dbf67c513e9f6c74e9698301fd5ac (patch) | |
| tree | 230d019d2c69edda98679029b762dd203c192764 /AUTHORS | |
| parent | b64251a6a8e5c819a46debd98e4b89e48cbcb5a2 (diff) | |
| parent | 7f9674419b585921b1da4ecbd5f3dc203891955e (diff) | |
| download | kombu-415dcc5ff86dbf67c513e9f6c74e9698301fd5ac.tar.gz | |
Merge branch '2.5'
Conflicts:
kombu/transport/mongodb.py
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -43,6 +43,7 @@ James Turk <james.p.turk@gmail.com> Jason Cater <jason@ncsfulfillment.com> Jasper Bryant-Greene <jbg@rf.net.nz> Jeff Balogh <me@jeffbalogh.org> +John Shuping <jshuping@acm.org> John Spray <jcspray@gmail.com> John Watson <john@disqus.com> Jonathan Halcrow <jonathan.halcrow@gmail.com> |