From: Brian Aker <brian@tangent.org>
Date: Fri, 7 Oct 2011 13:13:28 +0000 (-0700)
Subject: Merge trunk
X-Git-Tag: 1.0.2~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=c69776b7cf0d0c26b07abd83da8a797182ff6fae;hp=9428b4c34783838b84181abb0a5335ccd9db72ed;p=m6w6%2Flibmemcached

Merge trunk
---