* lisp/ChangeLog: Merge fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b812b00d66d4e6fd50b1271aadc355d938b3509..2b878c57e7f0c1b41ac7849bc7215885e9834058 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,7 +8,7 @@
        * net/tramp.el (tramp-handle-insert-file-contents): For root,
        preserve owner and group when editing files.  (Bug#7289)
 
-2010-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+2010-10-31  Glenn Morris  <rgm@gnu.org>
 
        * speedbar.el (speedbar-mode):
        * play/fortune.el (fortune-in-buffer, fortune):
@@ -17,8 +17,6 @@
        * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally):
        Replace inappropriate uses of toggle-read-only.  (Bug#7292)
 
-2010-10-31  Glenn Morris  <rgm@gnu.org>
-
        * select.el (x-selection): Mark it as an obsolete alias.
 
 2010-10-31  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
@@ -31,11 +29,6 @@
        * menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
        rather than just an unused variable that inherits from the real one.
 
-2010-10-31  Glenn Morris  <rgm@gnu.org>
-
-       * comint.el (comint-password-prompt-regexp):
-       Match "enter the password".  (Bug#7224)
-
 2010-10-31  Alan Mackenzie  <acm@muc.de>
 
        * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.