From: Bastien Guerry <bzg@altern.org>
Date: Wed, 9 Jan 2013 11:53:04 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~564
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/81959fc8c0607490eecab8ac540f36070e6722ad

Merge branch 'maint'
---

81959fc8c0607490eecab8ac540f36070e6722ad