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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5e0b5ac4f4bcf06fa1ccf54693bfe94120a3b0f..2d9ac9cb5fe408df89f4bf310dd70e9c280056db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -576,11 +576,15 @@
 
 2010-05-25  Ryan Yeske  <rcyeske@gmail.com>
 
-       * 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  <rcyeske@gmail.com>
+           Jonathan Rockway  <jon@jrock.us>
+
+       * 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.