From: Glenn Morris <rgm@gnu.org>
Date: Mon, 1 Dec 2014 21:35:13 +0000 (-0500)
Subject: Restore ChangeLog entry clobbered earlier today.
X-Git-Tag: emacs-25.0.90~2635^2~234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f54f7b3760218d53743e5f8e3f0d3065a03ee23;p=emacs.git

Restore ChangeLog entry clobbered earlier today.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0b0ca666f8..106849b4686 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  <larsi@gnus.org>
+
+	* net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the
+	dom.el changes.
+
 2014-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the