diff lisp/erc/ChangeLog @ 108375:973b5bc5fcfe

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 08 May 2010 14:47:07 -0400
parents b4d27afff1bf bfc8980754ed
children eb66d5d15b09
line wrap: on
line diff
--- a/lisp/erc/ChangeLog	Sat May 08 11:42:56 2010 -0700
+++ b/lisp/erc/ChangeLog	Sat May 08 14:47:07 2010 -0400
@@ -1,3 +1,7 @@
+2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Version 23.2 released.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.2.
@@ -12,8 +16,8 @@
 	(erc-server-reconnect): Use it to reconnect via old
 	connector (Bug#4958).
 
-	* erc.el (erc-determine-parameters): Save
-	erc-server-connect-function to erc-session-connector.
+	* erc.el (erc-determine-parameters):
+	Save erc-server-connect-function to erc-session-connector.
 
 2009-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>