From: Brian Aker <brian@tangent.org>
Date: Tue, 26 Jul 2011 19:08:26 +0000 (-0700)
Subject: Merge up trunk
X-Git-Tag: 1.0.2~25^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a4f7c3b9413014291d0ca549f32455b3be10a6c0;p=awesomized%2Flibmemcached

Merge up trunk
---

a4f7c3b9413014291d0ca549f32455b3be10a6c0
diff --cc libmemcached/csl/parser.am
index 00000000,b5f93c2f..e69de29b
mode 000000,100644..100644
--- a/libmemcached/csl/parser.am
+++ b/libmemcached/csl/parser.am