Merge trunk for LP

[awesomized/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index a64e1be4e954db59bc2283a59cda9f9959b86437..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
@@ -103,3 +103,4 @@ libtest/wait
 docs/text
 docs/changes
 tests/cycle
+libtest/unittest