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

Merge branch 'maint'
---

bb15139ab7f6ebddf7842b01cced7ecbe7b485e5