Merge branch 'master' of https://git.gnus.org/gnus

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90b197c..a9bfaf1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Julien Danjou  <julien@danjou.info>
+
+       * gnus-html.el (gnus-html-rescale-image): Use our defalias
+       gnus-window-inside-pixel-edges.
+
 2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-srvr.el (gnus-server-copy-server): Add documentation.