Merged trunk.
authorMonty Taylor <mordred@inaugust.com>
Fri, 11 Mar 2011 19:13:20 +0000 (11:13 -0800)
committerMonty Taylor <mordred@inaugust.com>
Fri, 11 Mar 2011 19:13:20 +0000 (11:13 -0800)
commit49fc1e5ea4ea006f4a2ac71428833760f6fac030
tree9c9cd239e1eee0b6a0b36a9d5fdb403cffaa8e9e
parent1eae35aca01e152e10113cd97b7571ebd6eb5bd9
parent14852ade094615994f43693363e5a4d48dbbb1d3
Merged trunk.
Makefile.am
docs/memcached_callback.rst