From: Bastien <bzg@gnu.org>
Date: Mon, 3 Jul 2017 07:06:29 +0000 (+0200)
Subject: Merge branch 'master' into scratch/org-mode-merge
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1546^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5ca1888fe670aee7febd4d42665d7372ab2ffebc;p=emacs.git

Merge branch 'master' into scratch/org-mode-merge
---

5ca1888fe670aee7febd4d42665d7372ab2ffebc