From: Bastien Guerry <bzg@altern.org>
Date: Sat, 29 Dec 2012 09:26:03 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~635
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/7773e0d94cb19f57a762303fe0a0549a52c99f08

Merge branch 'maint'
---

7773e0d94cb19f57a762303fe0a0549a52c99f08