1 files changed, 13 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ea977e80cfa..145028ec815 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,16 @@
+2012-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
+
+2012-08-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * charsets/mule-charsets.el (header): Fix typo.
+
+2012-08-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        On assertion failure, print backtrace if available.
+        * merge-gnulib (GNULIB_MODULES): Add execinfo.
+
 2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use ASCII tests for character types.