Merge from emacs-23; up to 2010-06-12T10:58:54Z!romain@orebokech.com.

[gnu-emacs] / lisp / url / url-proxy.el

diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index 2c370e2dc2cf19fa3c01d6e306606f43c65f5737..3290f7c5141e51608a323e79d9f0c463186a0a2c 100644 (file)
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,6 +1,6 @@
 ;;; url-proxy.el --- Proxy server support
 
-;; Copyright (C) 1999, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004-2011 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -76,5 +76,4 @@
   
 (provide 'url-proxy)
 
-;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62
 ;;; url-proxy.el ends here