Merge in updates from m4.

[awesomized/libmemcached] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 24dbad1dfc11e0ea59c622306f480d1975ecb1aa..1bdae2fbc4a40a859f7b9f5985d8979dbb2d4a7f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,8 +3,9 @@ Mark Atwood, -- Tools, Docs
 Patrick Galbraith, -- C++ Interface
 Padraig O'Sullivan, -- C++ Interface (current one)
 Tim Bunce, -- Docs
-Trond Norbye, trond.norbye@sun.com -- Binary protocol, Misc
+Trond Norbye, trond.norbye@gmail.com -- Binary protocol, Misc
 Yin Chen, -- Ketama Work
 Toru Maesaka, dev@torum.net -- Stats analysis
 Eric Lambert, -- UDP work
 Monty Taylor, -- Build Releated (Pandora)
+Mingqiang Zhuang, Schooner Information Technology, Inc. -- Rewrite of memslap