From: Bastien Guerry <bzg@altern.org>
Date: Tue, 8 Jan 2013 21:33:52 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~566
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/832b6e66ea453a01dbb7b2b4f49513e9cb782a0f

Merge branch 'maint'
---

832b6e66ea453a01dbb7b2b4f49513e9cb782a0f