From: Bastien Guerry <bzg@altern.org>
Date: Wed, 16 Jan 2013 17:36:33 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~536
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/1d8ba5a9cdae08d272ed77b4ecc49e451eb93829

Merge branch 'maint'
---

1d8ba5a9cdae08d272ed77b4ecc49e451eb93829