From: Brian Aker <brian@tangent.org>
Date: Thu, 7 Jul 2011 22:11:31 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: 0.51~1^2~8
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5a9c49c1e9f1950045eb845277c370324ac9ef16;p=m6w6%2Flibmemcached

Merge from trunk.
---

5a9c49c1e9f1950045eb845277c370324ac9ef16