Fix cherry-pick conflict.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9b3731aae98da3901d7200ed597e26a32f8a7c9..8f00403c39bda95c88b1990afb6c91e42cc3e85e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,8 @@
-2014-10-28  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
-2014-11-13  Michael Albinus  <michael.albinus@gmx.de>
+2014-11-15  Michael Albinus  <michael.albinus@gmx.de>
 
        * vc/vc-hg.el (vc-hg-state): Disable pager.  (Bug#18940)
 
-2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
+2014-10-28  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
 
        * mail/emacsbug.el (report-emacs-bug): Make a better guess at
          envelope-from when reporting through sendmail (bug#19054).