master updated (be85d2d920 -> 179a1d5298)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  be85d2d920 Tramp cleanup
       new  fee9deff53 Revert "Decrease use of the word "Emacsen" in docs"
       new  179a1d5298 ; * lisp/winner.el: Fix two comments.


Summary of changes:
 doc/misc/gnus.texi                 |  2 +-
 doc/misc/widget.texi               |  9 ++++++---
 lisp/cedet/semantic/bovine/c.el    |  2 +-
 lisp/cedet/semantic/wisent/comp.el |  2 +-
 lisp/desktop.el                    |  2 +-
 lisp/erc/erc-compat.el             |  4 ++--
 lisp/erc/erc-log.el                | 18 +++++++++---------
 lisp/gnus/gnus-util.el             |  2 +-
 lisp/mail/footnote.el              |  2 +-
 lisp/net/tramp-archive.el          |  4 ++--
 lisp/net/tramp-smb.el              |  2 +-
 lisp/net/tramp-uu.el               |  2 +-
 lisp/net/tramp.el                  |  4 ++--
 lisp/org/ol-eww.el                 |  2 +-
 lisp/org/org-compat.el             |  4 ++--
 lisp/shadowfile.el                 |  5 ++---
 16 files changed, 34 insertions(+), 32 deletions(-)