summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorBrian Bouterse <bmbouter@gmail.com>2014-06-11 09:21:03 -0400
committerBrian Bouterse <bmbouter@gmail.com>2014-06-11 09:21:03 -0400
commitc569d35c30284bb3deb228d7babd2ff578b76f2e (patch)
tree4540a84372cfb2d9c6e7d19dd8f90ebbee17e43a /AUTHORS
parent286672f2eca9f497c44e34f1535cf5d166f0813a (diff)
parent244b882e0c103b915e98de6ebb7d0cb026974515 (diff)
downloadkombu-c569d35c30284bb3deb228d7babd2ff578b76f2e.tar.gz
Merge branch 'master' into qpid-transport
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index ac3fed7d..1d90bc23 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@ Dustin J. Mitchell <dustin@mozilla.com>
Ephemera <obliviscence+git@gmail.com>
Eric Reynolds <ereynolds@opendns.com>
Fabrice Rabaute <fabrice@expa.com>
+Felix Schwarz <felix.schwarz@oss.schwarz.eu>
Fernando Jorge Mota <f.j.mota13@gmail.com>
Flavio [FlaPer87] Percoco Premoli <flaper87@flaper87.org>
Florian Munz <surf@theflow.de>
@@ -62,6 +63,7 @@ Joseph Crosland <jcrosland@flumotion.com>
Keith Fitzgerald <ghostrocket@me.com>
Kevin McCarthy <me@kevinmccarthy.org>
Kevin McDonald <k3vinmcdonald@gmail.com>
+Latitia M. Haskins <lhaskins@jetsonsys.com>
Mahendra M <Mahendra_M@infosys.com>
Marcin Lulek (ergo) <info@webreactor.eu>
Mark Lavin <mlavin@caktusgroup.com>