Merge remote-tracking branch 'origin/no-gnus'

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3eee67f..e3bf51c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-rescale-image): Allow viewing large images.
+       (shr-rescale-image): Fix wrong merge.
 
 2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>