diff options
| author | Ask Solem <ask@celeryproject.org> | 2013-02-07 15:38:15 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2013-02-07 15:38:15 +0000 |
| commit | 67d2fa4744f681a56cab69aa706cc3eb67bdd296 (patch) | |
| tree | 5dde2591b2dae191740d478a0cd85dd075466270 /AUTHORS | |
| parent | cc8b99b237019d0904c3da05850895db6b924a75 (diff) | |
| parent | 7c5dc19be1953e94fdf04adf016f91292677e144 (diff) | |
| download | kombu-67d2fa4744f681a56cab69aa706cc3eb67bdd296.tar.gz | |
Merge branch '2.5'
Conflicts:
pavement.py
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,6 +5,7 @@ Adam Nelson <adam@varud.com> Adam Wentz +Alex Koshelev <daevaorn@gmail.com> Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> Andrew Watts Andrey Antukh <niwi@niwi.be> |