From: Jim Meyering <jim@meyering.net>
Date: Tue, 8 Nov 2005 21:11:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v6.0~1382
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5ad46e57fc2e88090624cc0283d9f7c93648b2b;p=thirdparty%2Fcoreutils.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index f05d0e9bd5..3314692a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-2005-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+2005-11-08  Jim Meyering  <jim@meyering.net>
 
 	* Version 6.0-cvs.
 
+	* NEWS: Merge in changes from b5_9x branch.
+
+2005-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+
 	* NEWS: ls now defaults to --time-style='locale', which in turn acts
 	like --time-style='posix-long-iso' if the locale settings are messed up.
 	* src/ls.c (decode_switches): Implement this.