From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 16 Aug 2014 14:22:48 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.3~929
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/3a1fff1b22c01c9ab4e8d31b8bc4a805a8bc1f89

Merge branch 'maint'
---

3a1fff1b22c01c9ab4e8d31b8bc4a805a8bc1f89