From: Brian Aker <brian@tangent.org>
Date: Wed, 19 Oct 2011 01:50:52 +0000 (-0700)
Subject: Merge up all of development trunk.
X-Git-Tag: 1.0.2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=46394c394ae0348ddb321673d4e8fcdff15a7a02;hp=-c;p=m6w6%2Flibmemcached

Merge up all of development trunk.
---

46394c394ae0348ddb321673d4e8fcdff15a7a02