[Emacs-diffs] master 4f54f7b: Restore ChangeLog entry clobbered earlier today.

[Glenn Morris]

branch: master
commit 4f54f7b3760218d53743e5f8e3f0d3065a03ee23
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Restore ChangeLog entry clobbered earlier today.
---
 lisp/ChangeLog |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0b0ca6..106849b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -59,6 +59,11 @@
 
        * progmodes/cc-align.el (c-lineup-respect-col-0): New function.
 
+2014-12-01  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the
+       dom.el changes.
+
 2014-12-01  Stefan Monnier  <address@hidden>
 
        * vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the