From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Sun, 19 May 2013 07:54:18 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~206
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/a5872b9ecac9573913146590c6c464b5a3588af4

Merge branch 'maint'
---

a5872b9ecac9573913146590c6c464b5a3588af4