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)
commita6c3e3a3d04f379b1480c8c88a8eae17e54b1449
tree6a5271d53d113c73ceeaee1e3de2c1a55fae5006
parent088eed04d829b8cf6591201564118c356d3cf935
parent08cb9372fc4a1c660aeac3a89c5fe066538e8624
Merge in local trunk
ChangeLog
libmemcached/hosts.cc
libmemcached/server.h