merge upstream
authorTrond Norbye <trond.norbye@sun.com>
Sun, 14 Jun 2009 18:52:39 +0000 (20:52 +0200)
committerTrond Norbye <trond.norbye@sun.com>
Sun, 14 Jun 2009 18:52:39 +0000 (20:52 +0200)
1  2 
libmemcached/memcached.c
libmemcached/memcached.h
tests/function.c

Simple merge
Simple merge
Simple merge