From: Micah Cowan <micah@cowan.name>
Date: Sat, 4 Jul 2009 18:47:24 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~320
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=8e9a3e805fd758eadfc1bad6a4ef3e971de35ec4

Automated merge.
---

8e9a3e805fd758eadfc1bad6a4ef3e971de35ec4
diff --cc src/ChangeLog
index f7ea65c0,dbfd0b66..581b9e1c
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,10 +1,21 @@@
 +2009-07-04  Micah Cowan  <micah@cowan.name>
 +
 +	* main.c (print_version): Allow localization of the version-info
 +	labels, eschew attempts at alignment (which is complicated when
 +	handling translated strings), and avoid using printf() with
 +	variable-stored format strings that lack conversion
 +	specifications.
 +	(format_and_print_line): For similar reasons, don't calculate
 +	line-continuation tabulation based on the number of bytes in a
 +	string.
 +
+ 2009-07-04  Steven Schubiger  <stsc@member.fsf.org>
+ 
+ 	* url.c (url_parse): If an URL scheme is invalid, distinguish
+ 	between an unsupported or missing scheme.
+ 
+ 	* url.c: Add a "missing scheme" entry to parse_errors.
+ 
  2009-07-03  Micah Cowan  <micah@cowan.name>
  
  	* iri.h (iri_dup): Provide macro definition for when IRIs are