From: Brian Aker <brian@tangent.org>
Date: Mon, 19 Sep 2011 01:00:41 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~18
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9cf7ea2836b3ec5cb8b01f2d8399cbe0ae06bf60;p=m6w6%2Flibmemcached

Merge
---

9cf7ea2836b3ec5cb8b01f2d8399cbe0ae06bf60