From: Bastien Guerry <bzg@altern.org>
Date: Wed, 9 Jan 2013 13:11:12 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~563
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/1dd1b10d5a908ef302b76838931aefdab2d05f34

Merge branch 'maint'
---

1dd1b10d5a908ef302b76838931aefdab2d05f34