Merge Trunk

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 2431706f0d0c2a886687bdbc5d1592e1f36badc9..39de210dc4ff7043450899851c8ad78995e2eb47 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -54,7 +54,7 @@ docs/doctest/
 docs/doctrees/
 docs/html/
 docs/linkcheck/
-docs/man/*
+docs/conf.py
 example/memcached_light
 libhashkit/configure.h
 libmemcached-*.tar.gz