Merge branch '2.13'

zopefoundation · Jul 16, 2013 · 41c2220 · 41c2220
2 parents bed7df4 + 68a1795
commit 41c2220
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 225 deletions.
diff --git a/.bzrignore b/.bzrignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /.installed.cfg
+/.mr.developer.cfg
 /bin
 /build
 /develop
@@ -11,4 +12,3 @@
 /include/persistent
 *.egg-info
 *.py?
-.mr.developer.cfg
diff --git a/doc/INSTALL-buildout.rst b/doc/INSTALL-buildout.rst