Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3f3592e64c94c21f8ff734aa3666af358d979b43..8be343165f66c8b5639182d00e30c4da8157430b 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-31  Chong Yidong  <cyd@gnu.org>
+
+       * emacs.texi: Fix ISBN (Bug#12080).
+
 2012-08-05  Chong Yidong  <cyd@gnu.org>
 
        * display.texi (Faces): Document frame-background-mode (Bug#7774).