Automated merge.

diff --cc src/ChangeLog
index 688b95957a4f1d309cf8f63696b552bcc20edd2f,99cd940cd518cd927d1c91a2588c098c48cbf8dc..193bcd75ca2fe5c9955463c0c29e9ffce6f19bfe
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,20 -1,8 +1,25 @@@
+ 2008-11-13  Micah Cowan  <micah@cowan.name>
+ 
+       * http.c (gethttp): Don't do anything when content-length >= our
+       requested range.
+ 
 +2008-11-16  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * main.c: Declare and initialize the numurls counter.
 +
 +      * ftp.c, http.c: Make the counter visible here and use it.
 +      
 +      * options.h: Remove old declaration from options struct.
 +
 +2008-11-15  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * init.c (defaults): Set default waitretry value.
 +
 +2008-11-14  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * main.c (format_and_print_line): Use a custom format 
 +      string for printing leading spaces.
 +
  2008-11-12  Micah Cowan  <micah@cowan.name>
  
        * ftp-ls.c (ftp_index): HTML-escape dir name in title, h1, a:href.

diff --cc src/http.c
Simple merge