1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b8e5f762f..8a908f6b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lib/getopt.c, lib/stat.c, m4/gl-comp.m4: Merge from gnulib.
+
 2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use gnulib's alloca-opt module.