From: Brian Aker <brian@tangent.org>
Date: Tue, 29 Nov 2011 19:43:02 +0000 (-0800)
Subject: Merge of trunk
X-Git-Tag: 1.0.3~4^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=de4a9c2f387cb27a298146ab6eae50bd1f35ce56;p=m6w6%2Flibmemcached

Merge of trunk
---

de4a9c2f387cb27a298146ab6eae50bd1f35ce56