Merge.
author <brian@gir.tangent.org> <>
Mon, 21 Jan 2008 04:36:03 +0000 (20:36 -0800)
committer <brian@gir.tangent.org> <>
Mon, 21 Jan 2008 04:36:03 +0000 (20:36 -0800)
commit74b5061e4b97edfed3b58f94bd594321e9ae425a
tree8fb89d70b34f037a9c37f98f61565c4484de039e
parent02859b1de56972ed7b7538dfd3079a4e753fce41
parenta3116391d4e14bfd7eda4a0167e6842036a3b3e4
Merge.
include/memcached.h
lib/memcached_version.c