From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 8 Apr 2016 13:55:34 +0000 (+0300)
Subject: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.93~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a75b9a6;p=emacs.git

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

a75b9a6f2276a15a155660c99f7ff654190b7e9a