summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-04-17 15:19:29 +0100
committerAsk Solem <ask@celeryproject.org>2013-04-17 15:19:29 +0100
commit4146118de3bcbb63af226aef5887b931e0f10adc (patch)
treeaed26321402b43faeb95705dbb547451448c67c9 /AUTHORS
parent970e27db8e5d05a31574f4b90c151832d620f772 (diff)
parentb639fef1f55b39d1c862a0b57d9e4ab06ec77ad4 (diff)
downloadkombu-4146118de3bcbb63af226aef5887b931e0f10adc.tar.gz
Merge branch '2.5'
Conflicts: Changelog kombu/utils/eventio.py
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index f71d658e..54fe0a17 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>
+Dan LaMotte <lamotte85@gmail.com>
Dan McGee <dan@archlinux.org>
Dane Guempel <daneguempel@gmail.com>
David Clymer <david@zettazebra.com>
@@ -61,6 +62,7 @@ Petar Radosevic <petar@wunki.org>
Peter Hoffmann <tosh54@gmail.com>
Pierre Riteau <priteau@ci.uchicago.edu>
Rafael Duran Castaneda <rafadurancastaneda@gmail.com>
+Rafal Malinowski <malinowski@red-sky.pl>
Ralf Nyren <ralf-github@nyren.net>
Rob Ottaway <robottaway@gmail.com>
Rumyana Neykova <rumi.neykova@gmail.com>