From: Bastien Guerry <bzg@altern.org>
Date: Thu, 31 Jan 2013 13:17:13 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~468
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/394398afab047382f529baa94ed264dc3882d54d

Merge branch 'maint'
---

394398afab047382f529baa94ed264dc3882d54d