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

Merge branch 'maint'
---

ad9ca25d869f264f87e76932fc717f5e680de9c2