From: Brian Aker <brian@tangent.org>
Date: Tue, 5 Apr 2011 02:18:34 +0000 (-0700)
Subject: Merge in old and new memslap.
X-Git-Tag: 0.51~18^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fc50886aa7426f60ef4ef32882133250f5c1697c;p=m6w6%2Flibmemcached

Merge in old and new memslap.
---

fc50886aa7426f60ef4ef32882133250f5c1697c
diff --cc .bzrignore
index 6d1eabf5,06c56d69..1fe320b9
--- a/.bzrignore
+++ b/.bzrignore
@@@ -20,6 -20,6 +20,7 @@@ Makefile.i
  TAGS
  aclocal.m4
  autom4te.cache
++clients/memaslap
  clients/memcapable
  clients/memcat
  clients/memcp