Automated merge.

diff --cc src/ChangeLog
index 4da5e1d3319764cf773bfb992e748f0142536a18,2746126321ad4e48a648bb437a97f26f98a5e779..8865e5dd2f431fbd7281c6f470a233693a434831
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,15 -1,13 +1,25 @@@
 -2008-04-12  Micah Cowan  <micah@cowan.name>
++2007-04-12  Micah Cowan  <micah@cowan.name>
+ 
+       * mswindows.c (fake_fork_child): Don't create a logfile for
+       --background when --quiet is used, but not --server-response.
+       Don't mention that we're backgrounding if --quiet is used. Based
+       on a patch submitted by Rabin Vincent <rabin@rab.in>.  Fixes bug
+       #20917.
+ 
+       * utils.c (fork_to_background): Likewise.
+ 
 +2008-04-12  Micah Cowan  <micah@cowan.name>
 +
 +      * utils.c (aprintf): Minor formatting changes to Alex's code (80-
 +      column limit, concatenated string literals, avoiding nesting
 +      levels), and removed invocation of free (since we're aborting
 +      anyway).
 +
 +2008-04-11  Alexander Dergachev  <cy6erbr4in@gmail.com>
 +
 +      * utils.c (aprintf): Now we are setting limits (1 Mb) for text
 +      buffer when we use non-C99 vsnprintf.
 +      
  2008-04-11  Micah Cowan  <micah@cowan.name>
  
        * ftp.c (getftp, ftp_loop_internal): Don't append to an existing

diff --cc src/utils.c
Simple merge