From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 15 Aug 2014 19:52:17 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.3~933
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/88101ef43499bbd246bfff9e5865e653a54a8239

Merge branch 'maint'
---

88101ef43499bbd246bfff9e5865e653a54a8239