From: Bastien <bzg@gnu.org>
Date: Fri, 29 Dec 2017 17:58:41 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/HEAD

Merge branch 'maint'
---

58c9bedfd55751fd529a7501008e12b73fee4cee