From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 16 Aug 2016 18:35:17 +0000 (+0300)
Subject: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.1-rc2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e4e74e;p=emacs.git

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

2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc