From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 17 Mar 2016 19:34:49 +0000 (+0100)
Subject: Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.93~89^2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a2edd3;p=emacs.git

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

7a2edd3427b8006805c8fd293c2e481114776e4d