1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a2e7769eca..84d9987ccea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-02-21 putenv: port better to native Windows
+        2013-02-18 extern-inline: avoid compilation error with HP-UX cc
+        2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv
+
 2013-02-28  Ken Brown  <kbrown@cornell.edu>
 
         * configure.ac (HAVE_DATA_START): Fix test.  (Bug#13818)