From: Brian Aker <brian@tangent.org>
Date: Wed, 12 Dec 2012 08:29:55 +0000 (-0500)
Subject: Merge with trunk.
X-Git-Tag: 1.0.15~5^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a1dc0c7336cf2645c7b575a6b0140c500dbaf0f9;p=m6w6%2Flibmemcached

Merge with trunk.
---

a1dc0c7336cf2645c7b575a6b0140c500dbaf0f9