From: Bastien Guerry <bzg@altern.org>
Date: Thu, 11 Jul 2013 12:33:18 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~22
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/918551cec836b89c4f55bb1acf2626a939b9d1ee

Merge branch 'maint'
---

918551cec836b89c4f55bb1acf2626a939b9d1ee