From: Brian Aker <brian@tangent.org>
Date: Sat, 14 Jul 2012 19:23:35 +0000 (-0700)
Subject: Merge up to gearmand.
X-Git-Tag: 1.0.10~4^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bf755bec1cd09fad086a47650c1a725c9fbc7eb1;hp=bf755bec1cd09fad086a47650c1a725c9fbc7eb1;p=m6w6%2Flibmemcached

Merge up to gearmand.
---