Merge from erc--emacs--21
authorMiles Bader <miles@gnu.org>
Thu, 3 Aug 2006 05:10:38 +0000 (05:10 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 3 Aug 2006 05:10:38 +0000 (05:10 +0000)
commit2e3ef421a9e7888ed48241bbeecedaeefb58ab54
treed7a59eb24269a42164aff762ed8b4c952293cdac
parent6b2fcbb546b8b69b2eef40c5042439d3f822bec7
Merge from erc--emacs--21

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379
Creator:  Michael Olson <mwolson@gnu.org>
etc/ChangeLog
etc/ERC-NEWS
lisp/erc/ChangeLog
lisp/erc/erc-backend.el
lisp/erc/erc-log.el
lisp/erc/erc-spelling.el
lisp/erc/erc.el
man/ChangeLog
man/erc.texi