Merge from gnulib.

1 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c510360e30f..93c3c333725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-02-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-02-08 careadlinkat: stop exporting careadlinkatcwd
+        The MS-Windows port can remove careadlinkatcwd at its convenience.
+        2013-02-08 extensions: port better to HP-UX
+        2013-02-06 extensions: port better to MINIX 3, HP-UX, autoheader 2.62
+        2013-02-06 unistd: avoid namespace pollution on non-glibc systems
+        2013-02-04 secure_getenv: new module [module not used by Emacs]
+        2013-01-30 sys_time: port to Solaris 2.6
+
 2013-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539).