master updated (18b6289adfd -> f3da3d1c68b)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  18b6289adfd ; * java/org/gnu/emacs/EmacsPreferencesActivity.java: 
Fix commentary.
       new  7b4ca9e609e Leverage inverse-video for erc-inverse-face
       new  e2620fd7344 Make important text props more resilient in ERC
       new  166c8a98949 Redefine erc-spoiler-face to indicate revealed text
       new  f3da3d1c68b Fix faulty decoded-time adjustment in erc-stamp


Summary of changes:
 lisp/erc/erc-button.el             |   3 +-
 lisp/erc/erc-goodies.el            |  37 +++++----
 lisp/erc/erc-stamp.el              |   9 ++-
 lisp/erc/erc.el                    |  34 +++++++++
 test/lisp/erc/erc-goodies-tests.el | 153 ++++++++++++++++++++++++++-----------
 test/lisp/erc/erc-tests.el         |  52 +++++++++++++
 6 files changed, 226 insertions(+), 62 deletions(-)