summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-07-10 14:52:53 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-07-10 14:52:53 -0400
commit2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch)
tree4837c369ac576fbfd063b1ff046a3daca372f082 /lisp/url
parentc971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff)
parent7c33a0572280bdcf0583c5625cfda32f63fad56d (diff)
downloademacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 1de6f93416a..24fa2c0c064 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -806,7 +806,7 @@
(url-http-parse-headers): Use it.
(url-http-handle-authentication): Use subst-char-in-string.
-2005-11-16 Juergen Hoetzel <emacs@hoetzel.info> (tiny change)
+2005-11-16 Jürgen Hötzel <emacs@hoetzel.info> (tiny change)
* url-handlers.el (url-insert-file-contents): Use the charset info
provided by the HTTP server, if any.