From: Bastien Guerry <bzg@altern.org>
Date: Sun, 30 Dec 2012 00:21:32 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~623
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/460c4d4ed052329d349ead9476b21d19ab3a0692

Merge branch 'maint'
---

460c4d4ed052329d349ead9476b21d19ab3a0692