From: Glenn Morris <rgm@gnu.org>
Date: Thu, 31 May 2012 20:06:04 +0000 (-0400)
Subject: ChangeLog merge fix
X-Git-Tag: emacs-24.2.90~471^2~6^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b691b884eeef2ecb8772ac121ab23136b9d9d0d2;p=emacs.git

ChangeLog merge fix
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b70008fb821..372fc63fc8b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -19,12 +19,6 @@
 	* desktop.el (desktop-read): Clear previous and next buffers for
 	all windows and bury *Messages* buffer (bug#11556).
 
-2012-05-31  Eli Zaretskii  <eliz@gnu.org>
-
-	* mail/sendmail.el (mail-yank-region): Recognize
-	rmail-yank-current-message in addition to insert-buffer.  Fixes
-	mail-mode's "C-c C-r" that otherwise does nothing when invoked in
-
 2012-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Add `declare' for `defun'.  Align `defmacro's with it.