Merge in lp:504915
authorBrian Aker <brian@tangent.org>
Wed, 15 Jun 2011 00:03:00 +0000 (17:03 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 15 Jun 2011 00:03:00 +0000 (17:03 -0700)
commit02981035b5d948b8845ab08349afbd26b5f0a69c
treecba91d2c8cf662a10131c43b92d377e10f90ea1c
parent723bc354ac52038b4272677e2b621f6dfba4e55e
Merge in lp:504915
docs/memcached_server_st.rst
docs/memcached_servers.rst