Merge in local trunk
authorBrian Aker <brian@tangent.org>
Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
committerBrian Aker <brian@tangent.org>
Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
1  2 
ChangeLog
libmemcached/hosts.cc
libmemcached/server.h

diff --cc ChangeLog
Simple merge
Simple merge
Simple merge