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=5bb11da009c2f3bc4381bc8009c57007fd86534e

Automated merge.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 288ec11d..f8aae8b9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10,7 +10,7 @@
 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().