From d4fceca9cd0d6f42bd45f4c6e572d1335c9d40dc Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 15 Nov 2014 17:53:53 +0100
Subject: [PATCH] Fix cherry-pick conflict.

---
 lisp/ChangeLog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9b3731aae9..8f00403c39b 100644
--- 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).
-- 
2.39.5