From: Saint Xavier <wget@sxav.eu>
Date: Thu, 26 Jun 2008 16:01:01 +0000 (+0200)
Subject: Automated merge.
X-Git-Tag: v1.13~338^2~7^2~6^2~13^2~21
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=3b8b1b82d66a826d178b37b52dd9d158a5bb2ddc;hp=-c

Automated merge.
---

3b8b1b82d66a826d178b37b52dd9d158a5bb2ddc
diff --combined src/ChangeLog
index 288ec11d,c707eedf..f8aae8b9
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,7 +1,16 @@@
 +2008-06-26  Xavier Saint  <wget@sxav.eu>
 +
 +	* iri.c, iri.h : New functions locale_to_utf8() and
 +	idn_encode() adding basic capabilities of IRI/IDN.
 +
 +	* url.c : Convert URLs from locale to UTF-8 allowing a basic
 +	support of IRI/IDN
 +
 +
  2008-06-19  Xavier Saint  <wget@sxav.eu>
  
  	* iri.c, iri.h : New function check_encoding_name() as
- 	a priliminary encoding name check.
+ 	a preliminary encoding name check.
  
  	* main.c, iri.c : Make use of check_encoding_name().