Merge
author <brian@gir-2.local> <>
Wed, 13 Feb 2008 11:54:25 +0000 (17:24 +0530)
committer <brian@gir-2.local> <>
Wed, 13 Feb 2008 11:54:25 +0000 (17:24 +0530)
1  2 
ChangeLog
THANKS
include/memcached.h
src/memslap.c

diff --cc ChangeLog
Simple merge
diff --cc THANKS
index f91fa70564350182a972736ac1c4ef19060c4f0c,efbd621fd3633292b349cb1bf73142a56fe27fd6..45809cec22285ddc2682a4039559295c7c1885cb
--- 1/THANKS
--- 2/THANKS
+++ b/THANKS
@@@ -5,4 -5,5 +5,6 @@@ Tobias Luetke - Performance Feedbac
  Andre Cruz - Help with getting the CRC Hash function to match other connectors
  Brian Pontz - Hsieh hash
  Tim Bunce - Perl Driver work and feedback on API
+ Kevin Dalley - Bug Fixes
+ Patrick Galbraith - work on C++ interface
 +Ross McFarland - Idea for sorting servers.
Simple merge
diff --cc src/memslap.c
Simple merge