master updated (96d2fb8d79 -> 0d16e567fe)

[Philip Kaludercic]

zge pushed a change to branch master.

      from  96d2fb8d79 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
       new  1d9a8884db Have rcirc handle bridge bots
       new  6795b93d06 ; Don't set nil to be a face fore-/background
       new  9b5fe5d6f1 ; * doc/misc/rcirc.texi: Repunctuate some sentences
       new  0d16e567fe ; * doc/misc/rcirc.texi: Prefer 'setopt' over 'setq'


Summary of changes:
 doc/misc/rcirc.texi |  71 ++++++++++++++++++++++++++-------
 etc/NEWS            |  16 ++++++++
 lisp/net/rcirc.el   | 110 +++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 164 insertions(+), 33 deletions(-)