From: Brian Aker <brian@tangent.org>
Date: Sat, 9 Mar 2013 22:22:11 +0000 (-0500)
Subject: Merge trunk.
X-Git-Tag: 1.0.17~4^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=74ee88e5faed86095e8ae53c7831e1f1d2249557;p=m6w6%2Flibmemcached

Merge trunk.
---

74ee88e5faed86095e8ae53c7831e1f1d2249557