From: Micah Cowan <micah@cowan.name>
Date: Wed, 22 Apr 2009 18:44:13 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~361
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=bb2cba2cc7fcd0055d978aea4b31b8fc01841fc8

Automated merge.
---

bb2cba2cc7fcd0055d978aea4b31b8fc01841fc8
diff --cc src/ChangeLog
index 697919d3,37d39d80..28cb6640
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
 +2009-04-20  Micah Cowan  <micah@cowan.name>
 +
 +	* Makefile.am (version.c): Fix unportable use of "echo -n".
 +
+ 2009-04-13  Steven Schubiger  <stsc@member.fsf.org>
+ 
+ 	* ftp.c (ftp_retrieve_list): Move the duplicated code that
+ 	determines the local file to a function.
+ 	
+ 	* http.c (http_loop): Likewise.
+ 
+ 	* retr.c (set_local_file): New function.
+ 
  2009-04-11  Steven Schubiger  <stsc@member.fsf.org>
  
  	* init.c (initialize): Run a custom SYSTEM_WGETRC when