1 files changed, 10 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fe90917a70b..35190fd2a8f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * etags.c (consider_token): Always zero-terminate token buffer.
+        (Bug#12306)
+
+2012-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rely on <config.h> + <unistd.h> to declare 'environ'.
+        * emacsclient.c (environ): Remove decl.
+
 2012-08-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in ($(BLD)/regex.$(O)): Update dependencies.