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

Merge
---

d8950e28dc28d2c9503a44c9e7f8f75d7812fa8d