ChangeLog merge fix, grumble.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1376884e9d964f8f8f7a11d1609c75a37f2a282..7a491bd8fa01c756b0e1cdeef239e7bd367d838e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2011-05-05  Daniel Colascione <dan.colascione@gmail.com>
-
-       * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
-       correct match group (bug#8438).
-
 2011-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Fix earlier half-done eieio-defmethod change (bug#8338).