Automated merge with file:/home/micah/devel/wget/timestamp-on-get

diff --combined src/ChangeLog
index d6657e175daf957bc9c15d3a4186e5759e1c9a71,68e34e5c313e72d53b0cc6b7c5436df7661fba81..e6e4d480851b88dd2d9a3c41a5a56bfa600f4e2a
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,3 +1,9 @@@
 +2007-10-04  Micah Cowan  <micah@cowan.name>
 +
 +      * http.c (http_loop): We've got_name if content_disposition
 +      support isn't on; make sure we continue properly in that case,
 +      even though we're not sending HEAD.
 +
  2007-10-02  Micah Cowan  <micah@cowan.name>
  
        * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main
@@@ -32,6 -26,11 +32,11 @@@
        * http.c (http_zero): Remove no-longer-used local_size variable.
        Fixes bug #21057.
  
+ 2007-09-12  Micah Cowan  <micah@cowan.name>
+ 
+       * http.c (http_loop): Remove send_head_first from condition for
+       parsing timestamp.
+ 
  2007-08-29  Micah Cowan  <micah@cowan.name>
  
        * openssl.c (ssl_init): Re un-const-ified the meth local