From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:51:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5d90b5fcf0251466055c7dbed6069c1850d802d;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

07442de ; * etc/NEWS: Backport edit made on wrong branch.
---

f5d90b5fcf0251466055c7dbed6069c1850d802d