Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org

[bpt/emacs.git] / lisp / erc / erc-ring.el

diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 3040060..6b3f3e3 100644 (file)
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -1,9 +1,9 @@
 ;; erc-ring.el -- Command history handling for erc using ring.el
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
-;;   2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory
 
@@ -144,4 +144,3 @@ containing a password."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: b77924a8-a80e-489d-84cd-b351761ea5c8