[Emacs-diffs] /srv/bzr/emacs/trunk r100567: Fix ChangeLog attribution.

[Glenn Morris]

------------------------------------------------------------
revno: 100567
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-09 22:17:21 -0700
message:
  Fix ChangeLog attribution.
  
  This is on the assumption that the change from
  
  http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00196.html
  
  is actually based on the change from
  
  http://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00606.html
  http://debbugs.gnu.org/cgi/bugreport.cgi?bug=2404
  
  The fact that this wasn't pointed out at the time explains the recent
  confusion with the latest emacs23 -> trunk merge.
modified:
  lisp/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-10 01:10:04 +0000
+++ b/lisp/ChangeLog    2010-06-10 05:17:21 +0000
@@ -576,11 +576,15 @@
 
 2010-05-25  Ryan Yeske  <address@hidden>
 
-       * net/rcirc.el (rcirc-server-alist): Add :pass.
-       (rcirc-default-user-name): Change to "user".
+       * net/rcirc.el (rcirc-default-user-name): Change to "user".
        (rcirc-default-full-name): Change to "unknown".
        (rcirc-user-name-history): Add variable.
-       (rcirc): When prompting for connection paramaters, also prompt for
+
+2010-05-25  Ryan Yeske  <address@hidden>
+           Jonathan Rockway  <address@hidden>
+
+       * net/rcirc.el (rcirc-server-alist): Add :pass.
+       (rcirc): When prompting for connection parameters, also prompt for
        username and password.
        (rcirc-connect): Take a PASS argument.  If PASS is non-nil, send
        value to server when connecting.