Mercurial > emacs
diff lisp/erc/ChangeLog @ 107420:961da90b22a3
Merge from trunk
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 11 Mar 2010 11:05:39 +0100 |
parents | b4d27afff1bf |
children | 973b5bc5fcfe |
line wrap: on
line diff
--- a/lisp/erc/ChangeLog Mon Mar 08 13:05:51 2010 +0100 +++ b/lisp/erc/ChangeLog Thu Mar 11 11:05:39 2010 +0100 @@ -1,3 +1,7 @@ +2010-03-10 Chong Yidong <cyd@stupidchicken.com> + + * Branch for 23.2. + 2010-02-07 Vivek Dasmohapatra <vivek@etla.org> * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520).