Merge branch '2.13'

1102bbd4 · Hanno Schlichting · bbef09b4 · aa22e233 · 1102bbd4 · 1102bbd4
Commit 1102bbd4 authored May 01, 2013 by Hanno Schlichting
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitignore .gitignore +1 -0

doc/CHANGES.rst doc/CHANGES.rst +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /build
 /develop
 /develop-eggs
+/dist
 /eggs
 /parts
 /include/Acquisition

--- a/doc/CHANGES.rst
+++ b/doc/CHANGES.rst
@@ -3,7 +3,7 @@ Changelog

 This file contains change information for the current Zope release.
 Change information for previous versions of Zope can be found at
-http://docs.zope.org/zope2/releases/.
+http://docs.zope.org/zope2/

 4.0a1 (unreleased)
 ------------------