From: Brian Aker <brian@tangent.org>
Date: Wed, 5 Oct 2011 21:43:41 +0000 (-0700)
Subject: Merge in touch/etc
X-Git-Tag: 1.0.2~9^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bd53173d0a23c8c2a0dac68056cbd2cc52d5a6ef;p=m6w6%2Flibmemcached

Merge in touch/etc
---

bd53173d0a23c8c2a0dac68056cbd2cc52d5a6ef
diff --cc .bzrignore
index 8432fe19,dedeb4cb..dbe3e894
--- a/.bzrignore
+++ b/.bzrignore
@@@ -70,11 -70,12 +70,11 @@@ docs/doctest
  docs/doctrees/
  docs/html/
  docs/linkcheck/
 -docs/man/*
  docs/text
  example/memcached_light
- libhashkit/configure.h
+ libhashkit-1.0/configure.h
  libmemcached-?.??/
- libmemcached/configure.h
+ libmemcached-1.0/configure.h
  libmemcached/dtrace_probes.h
  libmemcached/generated_probes.h
  libmemcached/memcached_configure.h