Merge from emacs-23

[gnu-emacs] / lisp / eshell / eshell.el

diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 3c534f049c5ce027fe55ea2af8c2d4c5d095d36f..9e0c5b7bdb7bd2153f519dc858dce04c6cc5d6c7 100644 (file)
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -1,7 +1,7 @@
 ;;; eshell.el --- the Emacs command shell
 
 ;; Copyright (C) 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: John Wiegley <johnw@gnu.org>
 ;; Version: 2.4.2