From: Bastien Guerry <bzg@altern.org>
Date: Tue, 22 Jan 2013 15:39:28 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~519
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/196c5797d20e13c122097d1e3d3adf0969c8e59b

Merge branch 'maint'
---

196c5797d20e13c122097d1e3d3adf0969c8e59b