From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Dec 2010 17:26:01 +0000 (-0800)
Subject: ChangeLog merge fix.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~126
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a653f276763533708df0da340f27bdcad65cecb7;p=emacs.git

ChangeLog merge fix.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d7d5618ae8d..9d3b578fc95 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,7 +2,6 @@
 
 	* cl.texi (For Clauses): Small fixes for frames and windows.
 
-2010-12-13  Glenn Morris  <rgm@gnu.org>
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.texi (Using capture): Document using prefix arguments for
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6fd4b35b810..d21e005f180 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,7 +2,6 @@
 
 	* schema/schemas.xml: Add DocBook (Bug#7491).
 
-2010-12-13  Ulrich Mueller  <ulm@gentoo.org>
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* refcards/orgcard.tex: Cleanup.