1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9486bbdca3..4e6512e307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
+
 2011-05-24  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (check): Just give a message if no test/ directory.