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

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

diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 0ccb415da6c8e5d959519292005866236d50a735..0b9a4051d657a784d0ae0ee18830ac39a1a0a203 100644 (file)
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -1,7 +1,6 @@
 ;;; erc-fill.el --- Filling IRC messages in various ways
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2006,
-;;   2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
@@ -193,4 +192,3 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: 89224581-c2c2-4e26-92e5-e3a390dc516a