Merge.

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 3b6a590fa0391e60b33d04ca70f4497e30d6f77c..0ffd2ab565a7d54385ea416a8d3ec44cba152938 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -71,7 +71,6 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
 docs/text
 example/memcached_light
 libhashkit-1.0/configure.h
@@ -142,3 +141,4 @@ tests/testudp
 tests/var/
 tmp_chroot
 unittests/unittests
+tests/libmemcached-1.0/testsocket