summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2014-01-16 15:01:19 +0000
committerAsk Solem <ask@celeryproject.org>2014-01-16 15:01:19 +0000
commit97abf06e054398f22b7bf77aa6349d8a2ccd860b (patch)
treed4cabb26972ef44dbd836d3f7d43470654a50bd2 /AUTHORS
parentbff6ddb0ea116e7c3b06f6cf2509c6411b3e4803 (diff)
parent07a312582d90b1303ff5d675613935392f6a6283 (diff)
downloadpy-amqp-readwrite.tar.gz
Merge branch 'master' into readwritereadwrite
Conflicts: amqp/transport.py
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 780d505..ad92086 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,3 +8,5 @@ Adam Wentz
Adrien Guinet <aguinet@quarkslab.com>
Tommie Gannert <tommie@spotify.com>
Dong Weiming <ciici123@gmail.com>
+Dominik Fässler <dfa@bezono.org>
+Dustin J. Mitchell <dustin@mozilla.com>