Merge from origin/emacs-24

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

diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 1fb3930091e5cedc75fdb4be12005fe49bf305c8..ca4df66d46b44490f5202dca72c9bcb7e9c948e6 100644 (file)
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,8 +1,9 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 ;; This file is part of GNU Emacs.