From: Brian Aker <brian@tangent.org>
Date: Wed, 14 Sep 2011 23:06:31 +0000 (-0700)
Subject: Merge trunk.
X-Git-Tag: 1.0.2~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=cd3afc695729e34623ab88cc690fa89470fa14dd;p=m6w6%2Flibmemcached

Merge trunk.
---

cd3afc695729e34623ab88cc690fa89470fa14dd