From: Bastien Guerry <bzg@altern.org>
Date: Wed, 24 Apr 2013 14:22:21 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~285
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/38051ce48179831bc971c83be04f59fe56d94e51

Merge branch 'maint'
---

38051ce48179831bc971c83be04f59fe56d94e51