From: Brian Aker <brian@tangent.org>
Date: Tue, 18 Oct 2011 00:48:40 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~4^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=995b0b293b47e2a45de776202938d365d3775319;p=m6w6%2Flibmemcached

Merge
---

995b0b293b47e2a45de776202938d365d3775319