[Emacs-diffs] emacs-24 r117315: ChangeLog fix (no need to merge to trunk)

[Glenn Morris]

------------------------------------------------------------
revno: 117315
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-06-26 20:34:42 -0400
message:
  ChangeLog fix (no need to merge to trunk)
  
  Since the change was just quickly reverting a change that does not
  have a ChangeLog entry of its own, it's confusing and unnecessary for
  the reversion to have a ChangeLog entry.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-26 19:22:08 +0000
+++ b/lisp/ChangeLog    2014-06-27 00:34:42 +0000
@@ -15,11 +15,6 @@
        we can't verify signature because of missing public key
        (backport for bug#17625).
 
-2014-06-26  Stefan Monnier  <address@hidden>
-
-       * progmodes/hideif.el: Undo last change which should only go to trunk
-       (do not merge).
-
 2014-06-26  Glenn Morris  <address@hidden>
 
        * emacs-lisp/cl-macs.el (help-add-fundoc-usage):