--- a/ChangeLog	Tue Oct 30 13:55:53 2001 +0000
+++ b/ChangeLog	Wed Oct 31 11:44:53 2001 +0000
@@ -1,3 +1,14 @@
+Wed Oct 31 2001 Jim Hague <jim.hague@acm.org>
+
+* AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c,
+  src/protocol.h,src/server.c: Merge with latest 1.0 branch. I do not
+  intend to do any further merges from the 1.0 branch; future changes to
+  1.0 should be carried over by hand if necessary.
+* src/configfile.c,src/content.c,src/control.c,src/database.c,
+  src/dynamicstring.c,src/fetch.c,src/filter.c,src/group.c,
+  src/itemlist.c,src/lock.c,src/outgoing.c,src/over.c,src/post.c,
+  src/pseudo.c,src/request.c,src/util.c: Minor includes rearrangement.
+	
 Tue Oct 30 2001 Jim Hague <jim.hague@acm.org>
 
 * src/content.c: When generating temp file to write new content to, make
@@ -227,11 +238,10 @@
    Applied patch by Paul Slootman: using the mail program is
    replaced by sendmail (SENDMAILPROG variable).
 
-Sat Sep 02 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
+Sun Sep 10 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
 
- * NEWS,src/client.c,src/protocol.c,src/protocol.h,src/server.c:
-   Added timeout to Prt_getLn to avoid Noffle hanging if the
-   connection breaks down during a fetch.
+ * docs/NOTES: Added section about Gravity (thanks to
+   Tomislav Filipcic <tfilip@jagor.srce.hr>).
 
 Sun Sep 10 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
 
@@ -239,6 +249,12 @@
  * src/fetch.c: Fixed a bug in Fetch_init, that triggered
    an assertion if connection to remote server failed.
 
+Sat Sep 02 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
+
+ * NEWS,src/client.c,src/protocol.c,src/protocol.h,src/server.c:
+   Added timeout to Prt_getLn to avoid Noffle hanging if the
+   connection breaks down during a fetch.
+
 Wed Aug 23 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
 
  * src/post.c: do no longer always replace invalid message-IDs.