Merge changes from emacs-23 branch.

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

diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index e153e0185d26c2095a1d8fb9ced01ebab1da774f..fb55988c0e2cdb402fea508ef8c1374f8c5b3aa8 100644 (file)
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -1,6 +1,6 @@
 ;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
 
-;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 ;; From freenode.net's web site (not there anymore) on how to mark
 ;; unidentified users:
 ;; "We recommend that you add an asterisk before the nick, and
-;;  optionally either highlight or colourize the line in some
+;;  optionally either highlight or colorize the line in some
 ;;  appropriate fashion, if the user is not identified."
 
 ;;; Usage: