From: Bastien Guerry <bzg@altern.org>
Date: Mon, 14 Jan 2013 17:05:15 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~538
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/626212af0e4b3313e3872b160c1684a12da4bfdf

Merge branch 'maint'
---

626212af0e4b3313e3872b160c1684a12da4bfdf