From: Brian Aker <brian@tangent.org>
Date: Mon, 26 Sep 2011 21:54:16 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~10^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=178d4c4b7794f9115f9c4d387b01c14961cb3c1e;p=m6w6%2Flibmemcached

Merge
---

178d4c4b7794f9115f9c4d387b01c14961cb3c1e