[Emacs-diffs] master updated (882370e -> f3be002)

[Stephen Leake]

stephen_leake pushed a change to branch master.

      from  882370e   eshell/esh-ext.el: Expand relative remote file names.
       new  fcb978e   Move user-level information from CONTRIBUTE to 
doc/emacs/trouble.texi
       new  b4161ac   * CONTRIBUTE: add Savannah url, cleanup announcing freeze.
       new  f3be002   resolve ChangeLog merge conflict


Summary of changes:
 CONTRIBUTE             |  272 +++++++++++++----------------------------------
 ChangeLog              |   23 ++++
 doc/emacs/trouble.texi |  240 +++++++++++++++++++++++++++++++++++++++---
 lisp/startup.el        |    8 +-
 4 files changed, 323 insertions(+), 220 deletions(-)