From: Brian Aker <brian@tangent.org>
Date: Wed, 12 Oct 2011 19:38:37 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=979239247fed928fab4421cb13818e7d7998a200;p=m6w6%2Flibmemcached

Merge
---

979239247fed928fab4421cb13818e7d7998a200