Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm@gnu.org

[gnu-emacs] / lisp / erc / ChangeLog.06

diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index d13a3923f12e6da6b833b4c6769bccd0c2be25ac..e3026c96a4daa1a3b8599cd142c672713fc2013e 100644 (file)
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -174,7 +174,7 @@
        * erc-nicklist.el (erc-nicklist-insert-contents): Add missing
        parenthesis.  Thanks to Stephan Stahl for the report.
 
-2006-09-10  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
+2006-09-10  Eric Hanchrow  <offby1@blarg.net>
 
        * erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp
        instead of a single user.
@@ -370,7 +370,7 @@
        * erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
        Pass `buffer' argument to erc-log-setup-logging instead of setting
        the current buffer.  Ditto for erc-log-disable-logging.
-       (erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
+       (erc-log-setup-logging, erc-log-disable-logging): Accept a `buffer'
        argument.
 
        * erc-list.el (erc-chanlist): Use erc-with-server-buffer.
@@ -1091,7 +1091,7 @@
        (erc-speedbar-goto-buffer): Fix compiler warning.
 
        * erc-ibuffer.el: Use `define-ibuffer-filter' instead of
-       `ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
+       `ibuffer-define-limiter'.  Use `define-ibuffer-column' instead of
        `ibuffer-define-column'.  Require 'ibuf-ext so that the macros
        work without compiler warnings.
 
@@ -1430,7 +1430,7 @@
 
 See ChangeLog.05 for earlier changes.
 
-    Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+       Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -1452,4 +1452,3 @@ See ChangeLog.05 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a