Merge from emacs-24; up to 117702
commit9e10075626ace84f8062ab8cb6282defa292603d
authorGlenn Morris <rgm@gnu.org>
Mon, 10 Nov 2014 16:49:41 +0000 (10 08:49 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 10 Nov 2014 16:49:41 +0000 (10 08:49 -0800)
tree93bc2fd0a0c911c68b45cca9136f925bad3526d1
parentafb8ff4e41602bf905ebd61077021f02f220bcd6
parent0e69a1e44666d63fbf929f6d290be75220990c92
Merge from emacs-24; up to 117702
lisp/erc/ChangeLog