Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

[gnu-emacs] / lisp / erc / erc-menu.el

diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 0eb2b995225ce17a9b19f0217c84538254c8f93c..ea4ed399a647337f5a91dce3006b8ccb1e1b5080 100644 (file)
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -1,7 +1,6 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007,
-;;   2008  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2002, 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, menu
@@ -148,4 +147,3 @@ ERC menu yet.")
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 671219f2-b082-4753-a185-1d0c7e0c05bd