From: Brian Aker <brian@tangent.org>
Date: Mon, 9 Jan 2012 02:28:21 +0000 (-0800)
Subject: Merge
X-Git-Tag: 1.0.3^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4d0de3f8e1e85de79383a2c72f26cfa04a29bf0e;p=m6w6%2Flibmemcached

Merge
---

4d0de3f8e1e85de79383a2c72f26cfa04a29bf0e