Remove duplicate merged ChangeLog entries

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ff1ca0..081792c 100644 (file)
--- 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