From: Bastien Guerry <bzg@altern.org>
Date: Wed, 10 Jul 2013 10:13:09 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~25
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/044c8c5ebb903dc4a83846c9d2290b0611eaefdf

Merge branch 'maint'
---

044c8c5ebb903dc4a83846c9d2290b0611eaefdf