Merge from emacs-24; up to 117702
commit0121d32af5f58b284815da9c571f829f0f9e9186
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)
tree631877f8b259ce764e82d5ab30746ad368ae8c64
parentc832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe
parent7611d85a451de6f4c335585b3395b29e6a6d3e33
Merge from emacs-24; up to 117702
lisp/erc/ChangeLog