Merge changes from emacs-23 branch

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

diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index df31a93309c5720f20b2f92c0367ff026da700c0..0d7fcdac466fdf2d4497b81a6c8b489014a773cc 100644 (file)
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,7 +1,7 @@
 ;;; url-ftp.el --- FTP wrapper
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes