From: Brian Aker <brian@tangent.org>
Date: Sun, 11 Sep 2011 00:16:33 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~20^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3703bd721a0eb1a88267a5f376331321cecd3c85;p=m6w6%2Flibmemcached

Merge
---

3703bd721a0eb1a88267a5f376331321cecd3c85