From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 11 Aug 2014 17:48:58 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.3~937
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/644e602343fc500cf25041c6dc95fadafb50da4f

Merge branch 'maint'
---

644e602343fc500cf25041c6dc95fadafb50da4f