From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 4 Jan 2016 22:28:23 +0000 (+0100)
Subject: Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.90~267
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31a97acf43b7eb95f3ddc6ceca1682b35a5b1945;p=emacs.git

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

31a97acf43b7eb95f3ddc6ceca1682b35a5b1945