From: Bastien Guerry <bzg@altern.org>
Date: Tue, 22 Jan 2013 15:01:01 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~521
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/0aae38f8fa15b99a93ffca4b94dff7ac4d2f8205

Merge branch 'maint'
---

0aae38f8fa15b99a93ffca4b94dff7ac4d2f8205