summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorBrian Bouterse <bmbouter@gmail.com>2014-05-28 10:05:56 -0400
committerBrian Bouterse <bmbouter@gmail.com>2014-05-28 10:05:56 -0400
commit95c729b3f2861d52b2f67edd3ee073b718eab58e (patch)
treecfd19ee3f192b8ed141eb10d5a2a1ed268d5f826 /AUTHORS
parentdd39577b8aef79f10340015824edc60fc530c620 (diff)
parent86274e967d900077f5e509d436d92f5a5db34b63 (diff)
downloadkombu-95c729b3f2861d52b2f67edd3ee073b718eab58e.tar.gz
Merge branch 'master' into qpid-transport
Conflicts: README.rst docs/userguide/connections.rst
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index fe0dffef..ac3fed7d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -84,6 +84,7 @@ Rafal Malinowski <malinowski@red-sky.pl>
Ralf Nyren <ralf-github@nyren.net>
Randy Barlow <rbarlow@redhat.com>
Rob Ottaway <robottaway@gmail.com>
+Roger Hu <rhu@hearsaycorp.com>
Rumyana Neykova <rumi.neykova@gmail.com>
Rune Halvorsen <runeh@opera.com>
Ryan Petrello <lists@ryanpetrello.com>