Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b2bc0bb..601949a 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-05  Glenn Morris  <rgm@gnu.org>
+
+       * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
+
 2012-12-21  Glenn Morris  <rgm@gnu.org>
 
        * emacs-xtra.texi (copying): The FSF does not sell copies of this.
@@ -9713,7 +9717,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.