Merge trunk for LP

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 8f970c350d67533b23a483c037380f6774de72f5..4c52adb65793e8cad77582cc519ddbd5b1ec15b9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -57,7 +57,7 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
+docs/conf.py
 example/memcached_light
 libhashkit/configure.h
 libmemcached-*.tar.gz