From: Brian Aker <brian@tangent.org>
Date: Sun, 12 Feb 2012 19:00:17 +0000 (-0800)
Subject: Merge
X-Git-Tag: 1.0.7~17^2~22
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=c7cf10015c179608f1b6e3d1614ae744b21d0f98;p=m6w6%2Flibmemcached

Merge
---

c7cf10015c179608f1b6e3d1614ae744b21d0f98