From: Glenn Morris <rgm@gnu.org>
Date: Thu, 3 Jan 2013 00:38:32 +0000 (-0800)
Subject: Remove duplicate merged ChangeLog entries
X-Git-Tag: emacs-24.3.90~173^2~7^2~420
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13d6a1a4173c3e2c6e4139f3b55ceb329b0ef59b;p=emacs.git

Remove duplicate merged ChangeLog entries
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ff1ca01c4a..081792c9719 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -22,16 +22,6 @@
 
 	* vc/log-edit.el (log-edit-header-contents-regexp): Add doc string.
 
-2013-01-02  Fabián Ezequiel Gallina  <fgallina@cuca>
-
-	* progmodes/python.el: Support other commands triggering
-	python-indent-line so indentation cycling continues to work.
-	(python-indent-trigger-commands): New defcustom.
-	(python-indent-line): Use it.
-
-	* progmodes/python.el (python-shell-send-region): Add blank lines
-	for non sent code so backtraces remain correct.
-
 2013-01-02  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* emacs-lisp/byte-run.el (defmacro): Don't lose final nil if