From: Brian Aker <brian@tangent.org>
Date: Mon, 9 Apr 2012 15:23:25 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.7~8^2^2^2~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Flibmemcached;a=commitdiff_plain;h=33b1be807f69d8ed539f0346d6446a48335b4295

Merge
---

33b1be807f69d8ed539f0346d6446a48335b4295