From: Brian Aker <brian@tangent.org>
Date: Sat, 18 Feb 2012 21:36:50 +0000 (-0800)
Subject: Merge trunk
X-Git-Tag: 1.0.7~17^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=0b11235514c679e2545176348ce56c1e19ba4d30;p=awesomized%2Flibmemcached

Merge trunk
---

0b11235514c679e2545176348ce56c1e19ba4d30