From: Brian Aker <brian@tangent.org>
Date: Mon, 24 Oct 2011 15:01:21 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~3^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=69f923d9fb1e3017350391f05801195b71c885d1;p=m6w6%2Flibmemcached

Merge
---

69f923d9fb1e3017350391f05801195b71c885d1