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

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

diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index d337bcd74350aebbfa2da0e8c15f90bcb92be9e3..c158c47ab649b45ec9004694cc72e076f235db66 100644 (file)
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -1,6 +1,6 @@
 ;;; erc-join.el --- autojoin channels on connect and reconnects
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2011 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: irc