Merge from emacs-23

[gnu-emacs] / lisp / net / tramp-ftp.el

diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index b6a3cffa21182d8494924301a1b633516059288a..91eb27e89ee42e91ad8c96182cf33c753a6fd5f6 100644 (file)
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -1,7 +1,7 @@
 ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;;   2009, 2010 Free Software Foundation, Inc.
+;;   2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes