Merge from trunk.

1 files changed, 18 insertions, 0 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d6e25188c69..3c9313e3e7d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,21 @@
+2012-04-10  William Xu  <william.xwl@gmail.com>  (tiny change)
+
+        * url.el (url-retrieve-internal): Hexify multibye URL string first
+        when necessary (bug#7017).
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url.el (url-retrieve-internal): Mention utf-8 encoding.
+        (url-retrieve): Ditto.
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-domsurf.el: New file (bug#1401).
+
+        * url-cookie.el (url-cookie-two-dot-domains): Remove.
+        (url-cookie-host-can-set-p): Use `url-domsuf-cookie-allowed-p'
+        instead of the variable above.
+
 2012-03-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * url-queue.el (url-queue-kill-job): Check whether the buffer has