From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Sat, 25 Sep 2010 21:24:22 +0000 (+0200)
Subject: Merge branch 'master' of https://git.gnus.org/gnus
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=0631e16e48c4391052a5159917db0f7b1bfd1bec

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

0631e16e48c4391052a5159917db0f7b1bfd1bec
diff --cc lisp/ChangeLog
index 90b197c86,ea0dfa2f7..a9bfaf128
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,10 +1,12 @@@
+ 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.
 +
  	* mm-decode.el (mm-save-part): Allow saving to other directories the
  	normal Emacs way.