From: Bastien Guerry <bzg@altern.org>
Date: Wed, 24 Apr 2013 08:47:30 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~289
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/a959d2320104747f1d34e22ce9b64acde71d18ec

Merge branch 'maint'
---

a959d2320104747f1d34e22ce9b64acde71d18ec