From: Micah Cowan <micah@cowan.name>
Date: Sun, 13 Apr 2008 05:46:55 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~430^2
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=1a41bc067c118fe0cbc8a632e9716102bc357b13

Automated merge.
---

1a41bc067c118fe0cbc8a632e9716102bc357b13
diff --cc src/ChangeLog
index 4da5e1d3,27461263..8865e5dd
--- a/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