From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Sun, 8 Sep 2013 21:53:16 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1.2~17
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/aecdf50dc6efdfbb4c9e34636cc2c3828bf935a6

Merge branch 'maint'
---

aecdf50dc6efdfbb4c9e34636cc2c3828bf935a6