Merge from emacs-24; up to 117702

diff --cc lisp/erc/ChangeLog
index 475b99edb935bfdaee08294a904478901f32e026,e57659ea5f854965e39d31fe62e4d3d4c796aeed..9b8ec66ff55ff817073691ae8b592f4072602f99
--- 1/lisp/erc/ChangeLog
--- 2/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@@ -1,24 -1,8 +1,23 @@@
  2014-11-10  Kelvin White  <kwhite@gnu.org>
  
-       * erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el:
-       * erc-button.el: Update version to 24.5.
+       * erc-stamp.el (erc-timestamp-intangible): Change version tag to 24.5.
  
 -2014-11-09  Ivan Shmakov  <ivan@siamics.net>
 +2014-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * erc.el (erc-send-input): Bind `str' dynamically (bug#18936).
 +
 +2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Simplify use of current-time and friends.
 +      * erc-backend.el (TOPIC): Omit unnecessary call to current-time.
 +      * erc.el (erc-emacs-time-to-erc-time): Simplify by using float-time.
 +      (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
 +
 +2014-10-20  Glenn Morris  <rgm@gnu.org>
 +
 +      * Merge in all changes up to 24.4 release.
 +
 +2014-10-15  Ivan Shmakov  <ivan@siamics.net>
  
        * erc-track.el (erc-modified-channels-display): Update mode line
        more frequently (bug#18510).