From: l3thal <kwhite@gnu.org>
Date: Sun, 24 Jan 2016 20:20:31 +0000 (-0500)
Subject: Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.90~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fef1b30;p=emacs.git

Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
---

fef1b3066ae02ec6dd37b0358905491fabbedfdf