Merge Trunk

[m6w6/libmemcached] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 1414c33c644b238b2d6a2610ffc5d8bb3de44564..39de210dc4ff7043450899851c8ad78995e2eb47 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -49,6 +49,7 @@ config/top.h
 configure
 docs/*.[13]
 docs/*.html
+docs/conf.py
 docs/doctest/
 docs/doctrees/
 docs/html/