From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Wed, 2 Dec 2015 12:05:09 +0000 (+0000)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~2900
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5874cd46e9cd8b20c61190ad56055d73816c2303;p=emacs.git

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

5874cd46e9cd8b20c61190ad56055d73816c2303