From: Brian Aker <brian@tangent.org>
Date: Sat, 18 Feb 2012 09:12:01 +0000 (-0800)
Subject: Merge build trunk
X-Git-Tag: 1.0.7~17^2~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6ef1a889424da12b942330a82ffebe268494cd70;hp=6ef1a889424da12b942330a82ffebe268494cd70;p=m6w6%2Flibmemcached

Merge build trunk
---