From: Brian Aker <brian@tangent.org>
Date: Wed, 12 Oct 2011 22:06:53 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~5^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bc9a024d4d2292b68be5d3a90063ea0193c7770f;p=m6w6%2Flibmemcached

Merge
---

bc9a024d4d2292b68be5d3a90063ea0193c7770f