From: Micah Cowan <micah@cowan.name>
Date: Sun, 1 Mar 2009 10:57:14 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v1.13~366
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=4092d7eedc1ea90b03cc2922a5228c59616438b2

Merge.
---

4092d7eedc1ea90b03cc2922a5228c59616438b2
diff --cc src/ChangeLog
index 854f75db,05b56e8c..82531a83
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
 +2009-02-27  Gisle Vanem  <gvanem@broadpark.no>
 +
 +	* main.c (main): "freopen (NULL,.." causes an assertion in MSVC
 +	debug-mode.  I.e. NULL isn't legal. But the "CONOUT$" device works
 +	fine.
- 	
++
+ 2009-02-27  Steven Schubiger  <stsc@member.fsf.org>
+ 
+ 	* ftp.c (ftp_loop_internal): Don't claim for FTP retrievals
+ 	when writing to standard output either that the document
+ 	has been saved. Addresses bug #20520 again.
+ 
  2009-02-21  Steven Schubiger  <stsc@member.fsf.org>
  
  	* http.c (http_loop): When a document is written to