Merge from emacs-23

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

diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index e40972cb81cf407f1fb89c74d1956f90f8d4db96..1a65f1ee5d0fbafa76436bf5e6452291a1ccf8bc 100644 (file)
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,7 +1,7 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes