From: Bastien Guerry <bzg@altern.org>
Date: Tue, 4 Dec 2012 14:21:26 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~765
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/ae1b4960d1eacfa95f7c2f58cf2c91193e3190c8

Merge branch 'maint'
---

ae1b4960d1eacfa95f7c2f58cf2c91193e3190c8