# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1236439962 -3600
# Node ID 39dbf3c63a738f33d16fad1a4ca68297a17cd4e0
# Parent  ee7917a3f05072df68e3f25e48613065941320f6# Parent  11b1a7b0a78807ca3a71062efe6caed2739ee446
Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,7 +71,7 @@
 	Reported by Eric Blake.
 
 2009-03-06  Eric Blake  <ebb9@byu.net>
-            Bruno Haible  <bruno@clisp.org>
+	    Bruno Haible  <bruno@clisp.org>
 
 	* lib/spawni.c (__spawni) [WIN32_NATIVE]: Define as a stub.
 	* modules/posix_spawn-tests (configure.ac): Define POSIX_SPAWN_PORTED
@@ -176,7 +176,7 @@
 	least 4.2.
 
 2009-03-01  Eric Blake  <ebb9@byu.net>
-            Bruno Haible  <bruno@clisp.org>
+	    Bruno Haible  <bruno@clisp.org>
 
 	* lib/wait-process.h (wait_subprocess): Describe effect of termsigp on
 	error messages.