From: Brian Aker <brian@tangent.org>
Date: Thu, 22 Sep 2011 18:49:07 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: 1.0.2~12^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d63f10a9af5e838f2accccc686372b6d44227057;p=m6w6%2Flibmemcached

Merge from trunk
---

d63f10a9af5e838f2accccc686372b6d44227057