From: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date: Wed, 8 Jun 2016 05:36:41 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~1842
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f4f21b406a56d504c03a9bab3ac0949d8774c17;p=emacs.git

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

3f4f21b406a56d504c03a9bab3ac0949d8774c17