From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Wed, 10 Jul 2013 12:14:18 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~24
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/50749996053f4b9fbadaa5ba3bbea2b6826d50e7

Merge branch 'maint'
---

50749996053f4b9fbadaa5ba3bbea2b6826d50e7