From: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date: Wed, 25 May 2016 21:44:18 +0000 (+0200)
Subject: Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.95~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c12c53;p=emacs.git

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

6c12c53949acafbfcad2e08b1ac5cbe283d71597