Merge from mainline.

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

diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index bd27d9f262e6665b2a6b436060f018bb81ace55b..18fc8240b234f628222bea5374945412c97de1ba 100644 (file)
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,7 +1,7 @@
 ;;; em-term.el --- running visual commands
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -267,5 +267,4 @@ allowed."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: ab7c8fe4-3101-4257-925b-1354c6b2fe9d
 ;;; em-term.el ends here