From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 1 Jan 2017 09:05:02 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~966
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a89d04cf78de9c7c6942cc48b79b67e6f05a68c;p=emacs.git

Merge from origin/emacs-25

665be69 ; Update ChangeLog.2 and AUTHORS files

# Conflicts:
#	etc/AUTHORS
---

0a89d04cf78de9c7c6942cc48b79b67e6f05a68c
diff --cc etc/AUTHORS
index 0b300d0dbca,e53577140e3..9f951dfc1be
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@@ -486,8 -487,11 +486,10 @@@ Bob Rogers: changed vc-dir.el vc-svn.e
    ffap.el files.el maintaining.texi sql.el thingatpt.el vc.el
    vc1-xtra.texi
  
 -Bob Weiner: changed info.el quail.el dframe.el etags.c rmail.el
 -  rmailsum.el speedbar.el
 +Bob Weiner: changed info.el quail.el
  
+ Bogdan Creanga: changed sequences.texi strings.texi symbols.texi
+ 
  Bojan Petrovic: changed pop3.el
  
  Boris Goldowsky: wrote avoid.el descr-text.el enriched.el facemenu.el