From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:39:06 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b9ab8fb8ed13ae501fb58401ff97518e7736e7e;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

3f2b497 * etc/AUTHORS: Regenerate the AUTHORS file
---

9b9ab8fb8ed13ae501fb58401ff97518e7736e7e