From: Brian Aker <brian@tangent.org>
Date: Tue, 13 Dec 2011 03:19:16 +0000 (-0800)
Subject: merge
X-Git-Tag: 1.0.3~3^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=256805451de4f0dc6fe3b976894483b43313f46e;p=m6w6%2Flibmemcached

merge
---

256805451de4f0dc6fe3b976894483b43313f46e