From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2016 19:41:38 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1892
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=018be26a1a1851e7f7f92cb0289b0c30c329aa1c;p=emacs.git

Merge from origin/emacs-25

2d76405 etc/AUTHORS: Update the AUTHORS file
---

018be26a1a1851e7f7f92cb0289b0c30c329aa1c