summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Roberts <wizzat@gmail.com>2014-04-21 22:01:32 -0700
committerMark Roberts <wizzat@gmail.com>2014-04-21 22:01:32 -0700
commitd35b8fd81fac594835e8ef2861a32b7dc08716ab (patch)
treebb2201268e88f5ff11d05de2d4a9dca58bbb1255
parenta7cbfd361d3742dd8c7b57f59666c6aa442c95e2 (diff)
parent2415609ce0899ef53e761e7ccb13177782d46c4e (diff)
downloadkafka-python-d35b8fd81fac594835e8ef2861a32b7dc08716ab.tar.gz
Merge branch 'master' into add_tests
-rw-r--r--AUTHORS.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index dfcf3e7..8f168c6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,10 +4,21 @@ Ordered by contribution
* David Arthur, [@mumrah](https://github.com/mumrah)
* Mahendra M, [@mahendra](https://github.com/mahendra)
+* Omar, [@rdiomar](https://github.com/rdiomar) - RIP, Omar. 2014
+* Marc Labbé, [@mrtheb](https://github.com/mrtheb)
* Ivan Pouzyrevsky, [@sandello](https://github.com/sandello)
+* Thomas Dimson, [@cosbynator](https://github.com/cosbynator)
* Jim Lim, [@jimjh](https://github.com/jimjh)
+* Zack Dever, [@zever](https://github.com/zever)
* StevenLeRoux, [@StevenLeRoux](https://github.com/StevenLeRoux)
+* Saulius Žemaitaitis, [frgtn](https://github.com/frgtn)
+* Vadim Graboys, [@vadimg](https://github.com/vadimg)
+* Joe Crobak, [@jcrobak](https://github.com/jcrobak)
+* Niek Sanders, [@nieksand](https://github.com/nieksand)
+* Greg Bowyer, [@GregBowyer](https://github.com/GregBowyer)
+* Evan Klitzke, [@eklitzke](https://github.com/eklitzke)
* [@anentropic](https://github.com/anentropic)
+* Stephen Armstrong, [@stephenarmstrong](https://github.com/stephenarmstrong)
* Ben Frederickson, [@benfred](https://github.com/benfred)
Thanks, everyone!