master updated (82e50a23fea -> aa6315ee685)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  82e50a23fea cperl-mode.el: Don't use obsolete 
`special-display-popup-frame`
       new  bb894845ed6 Teach customize-option about erc-modules
       new  b7cdce09700 Fix local variable persistence in erc-stamp
       new  aa6315ee685 Reassociate erc-networks--id for orphaned queries


Summary of changes:
 etc/ERC-NEWS                                       |  9 ++-
 lisp/erc/erc-goodies.el                            |  2 +-
 lisp/erc/erc-networks.el                           | 25 ++++++-
 lisp/erc/erc-stamp.el                              | 39 ++++++----
 lisp/erc/erc.el                                    | 41 +++++-----
 test/lisp/erc/erc-networks-tests.el                | 46 ++++++++++++
 .../erc/erc-scenarios-base-upstream-recon-znc.el   | 46 ++++++++++++
 test/lisp/erc/erc-scenarios-misc.el                |  2 +-
 test/lisp/erc/erc-stamp-tests.el                   |  4 +-
 test/lisp/erc/erc-tests.el                         |  5 ++
 .../base/upstream-reconnect/znc-severed.eld        | 87 ++++++++++++++++++++++
 test/lisp/erc/resources/erc-scenarios-common.el    |  1 +
 test/lisp/erc/resources/erc-tests-common.el        |  2 +-
 13 files changed, 265 insertions(+), 44 deletions(-)
 create mode 100644 
test/lisp/erc/resources/base/upstream-reconnect/znc-severed.eld