Merge.

diff --combined src/ChangeLog
index 854f75dbd168370fd1dc4ff578797572f1aee23d,05b56e8c543fd374800d1033c1315b5be1eb201f..82531a83d17e981266a164d1ab71e0a93652bb8e
--- 1/src/ChangeLog
--- 2/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