* net/tramp.el (tramp-read-passwd): Suspend the timers while reading

[bpt/emacs.git] / lisp / erc / ChangeLog.04

diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 922fb0c..07f2fa9 100644 (file)
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -491,7 +491,7 @@
        members has been made some time ago.  Clean up the various tries to
        do this in the past.
 
-       erc-macs.el: Removed.  erc-members.el: Removed.
+       * erc-macs.el, erc-members.el: Removed.
 
 2004-08-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
@@ -2072,7 +2072,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-       Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc.
+       Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.