From: Micah Cowan <micah@cowan.name>
Date: Tue, 1 Sep 2009 18:00:57 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~274
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=42d953765b5e9bc82d8af862a0a6fd17d6c5f67e

Automated merge.
---

42d953765b5e9bc82d8af862a0a6fd17d6c5f67e
diff --cc tests/ChangeLog
index 6e2b41a4,683f099f..5b0d571d
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,8 -1,18 +1,23 @@@
 +2009-09-01  Micah Cowan  <micah@cowan.name>
 +
 +	* Makefile.am (../src/libunittest.a): Make it a phony target,
 +	so we always make sure to get up-to-date unit-test runs.
 +
+ 2009-09-01  Steven Schubiger  <stsc@member.fsf.org>
+ 
+ 	* Makefile.am: Add Test-cookies.px, Test-cookies-401.px
+ 	and Test-restrict-ascii.px to EXTRA_DIST.
+ 
+ 2009-08-31  Steven Schubiger  <stsc@member.fsf.org>
+ 
+ 	* Makefile.am: Add Test-k.px to EXTRA_DIST.
+ 
+ 2009-08-29  Steven Schubiger  <stsc@member.fsf.org>
+ 
+ 	* run-px: Add Test-k.px to the list.
+ 
+ 	* Test-k.px: Test escaping of semicolons in local file strings.
+ 
  2009-08-27  Micah Cowan  <micah@cowan.name>
  
  	* WgetTest.pm.in (run): Shift the errcode right by 8 binary places.