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

Merge branch 'maint'
---

94ea6bca087e92feae6d97be6b2c6072c93c0fd8