From: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date: Sat, 2 Jan 2016 15:59:42 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~2827^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c988877f436bbbb285a0b34f5e037f7758dd6349;p=emacs.git

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

c988877f436bbbb285a0b34f5e037f7758dd6349