From: Rasmus <rasmus@gmx.us>
Date: Fri, 29 Sep 2017 08:41:51 +0000 (+0200)
Subject: Merge branch 'emacs-26' into scratch/org-mode-merge
X-Git-Tag: emacs-26.0.90~103^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4b2bbdc73ace5cb0971a32a75941486489d1cc5;p=emacs.git

Merge branch 'emacs-26' into scratch/org-mode-merge
---

d4b2bbdc73ace5cb0971a32a75941486489d1cc5