1 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d56d74b20db..a6d5148c777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * info/dir: Add htmlfontify.
+
+2013-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-01-04 stdio: remove now-unnecessary stdio.c
+        2013-01-04 fprintftime: depend on stdio, not ignore-value
+        2013-01-04 fwrite: silence __wur only for older glibc versions
+        2013-01-04 fwrite: silence __wur without using inline
+        * lib/stdio.c: Remove.
+        * lib/stdio.in.h, lib/strftime.c: Update from gnulib.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
 2013-01-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, incorporating copyright-date changes and: