Merge from emacs-24

[gnu-emacs] / lisp / gnus / ChangeLog

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 419664976078953e6d15c3403082fbcf67d38df5..6c1d2b9b6249011436b3e667e8b4ad521a233643 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * shr.el (shr-expand-url): Handle URL starting with `//'.
+
+2012-07-17  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
 2012-07-13  Chong Yidong  <cyd@gnu.org>
 
        * smime.el (smime-certificate-info): Set buffer-read-only directly,