Merge branch 'maint-1.5.4' into maint

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 65571e05496eb3710cb89d93f5b95d34b77d1998..b540f7295a1bb48bf044d297201b07aca9fb5005 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -24,7 +24,7 @@ cat >gpatch.file <<\EOF &&
 +++ file1+     2007-02-21 01:07:44.000000000 -0800
 @@ -1 +1 @@
 -A
-+B
++B 
 EOF
 
 sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&