Automated merge.

diff --cc doc/ChangeLog
index e26fd89dddc2339ad63576a33b3cd9ff5680ab28,cc6f2aa9148e403f70b0fe6cb4badec3f4e8156f..8f498325a32f53a13d6b3e780ce16bfc346877ab
--- 1/doc/ChangeLog
--- 2/doc/ChangeLog
+++ b/doc/ChangeLog
@@@ -1,8 -1,12 +1,17 @@@
 +2008-11-05  Micah Cowan  <micah@cowan.name>
 +
 +      * wget.texi: Move --no-http-keep-alive from FTP Options to HTTP
 +      Options.
 +
+ 2008-11-04  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi, fdl.texi: Updated to FDL version 1.3.
+ 
+ 2008-10-31  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi (Mailing List): Update info to reflect change to
+       bug-wget@gnu.org.
+ 
  2008-09-30  Steven Schubiger  <stsc@members.fsf.org>
  
        * wget.texi (Wgetrc Commands): Add default_page, save_headers, 

diff --cc doc/wget.texi
Simple merge