From: Brian Aker <brian@tangent.org>
Date: Mon, 26 Sep 2011 06:19:58 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~11^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=15cb8f72fc3382dd80a88028cf45c05dcb2fa1ef;p=m6w6%2Flibmemcached

Merge
---

15cb8f72fc3382dd80a88028cf45c05dcb2fa1ef