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

Merge branch 'maint'
---

dcdec74b00e401c5884fed2ea5ebb7f39134fbc5