Mercurial > emacs
diff lisp/net/tramp.el @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | 209df3f0dcc6 376148b31b5e |
children | 4f72b1e43644 |
line wrap: on
line diff
--- a/lisp/net/tramp.el Fri Jan 14 16:06:17 2011 +0100 +++ b/lisp/net/tramp.el Fri Jan 14 12:18:41 2011 -0500 @@ -1,7 +1,7 @@ ;;; tramp.el --- Transparent Remote Access, Multiple Protocol ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Kai Großjohann <kai.grossjohann@gmx.net> ;; Michael Albinus <michael.albinus@gmx.de>