Merge from 2.5 branch.

6e49e7a0 · Brian Lloyd · d98c8f67 · 6e49e7a0 · 6e49e7a0
Commit 6e49e7a0 authored Dec 03, 2001 by Brian Lloyd
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

doc/CREDITS.txt doc/CREDITS.txt +3 -0

lib/python/App/dtml/copyright.dtml lib/python/App/dtml/copyright.dtml +6 -0

No files found.
--- a/doc/CREDITS.txt
+++ b/doc/CREDITS.txt
@@ -55,6 +55,9 @@ Credits
      long-time friend of Digital Creations.  Zope Power is Python
      Power.

+    o Special thanks to Richard Stallman and the Free Software
+      Foundation for their assistance and feedback on the
+      GPL-compatible 2.0 version of the Zope Public License.



--- a/lib/python/App/dtml/copyright.dtml
+++ b/lib/python/App/dtml/copyright.dtml
@@ -213,6 +213,12 @@ License Version 1.1</A>.
    long-time friend of Zope Corporation.  Zope Power is Python
    Power.</LI>

+    <LI>
+    Special thanks to Richard Stallman and the Free Software
+    Foundation for their assistance and feedback on the GPL-compatible 
+    2.0 version of the Zope Public License.
+    </LI>
+
 </UL>
 <P>
 Paul Everitt, <a href="mailto:paul@zope.com">paul@zope.com</a>.