[Zodb-checkins] CVS: ZODB3/Doc - ACKS:1.1.10.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/Doc
In directory cvs.zope.org:/tmp/cvs-serv26665/Doc

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	ACKS 
Log Message:
Merge the head to the mvcc branch.

This merge should be the final preparation for merging the branch to
the trunk.


=== ZODB3/Doc/ACKS 1.1 => 1.1.10.1 ===
--- ZODB3/Doc/ACKS:1.1	Fri May 30 15:28:06 2003
+++ ZODB3/Doc/ACKS	Tue Dec 23 14:06:19 2003
@@ -1,5 +1,5 @@
-Acknowledgements
-----------------
+Acknowledgments
+---------------
 
 This file lists people who have contribute code, bug fixes, ideas, and
 other support for ZODB.  Alas it is probably not complete.
@@ -19,6 +19,7 @@
 Andreas Jung
 Brian Lloyd
 Ken Manheimer
+Dieter Maurer
 Chris McDonough
 Tim Peters
 Chris Petrilli