merge trunk

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

diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index 6c5804c..5eb3338 100644 (file)
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -1,9 +1,10 @@
 ;; erc-replace.el -- wash and massage messages inserted into the buffer
 
-;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2002, 2004, 2006-2014 Free Software Foundation,
+;; Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
-;; Maintainer: Mario Lang (mlang@delysid.org)
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, client, Internet
 
 ;; This file is part of GNU Emacs.