From: Bastien Guerry <bzg@altern.org>
Date: Sat, 29 Dec 2012 10:04:47 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~634
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/42df907d483d36f70e74ab340bd8ffa2319182e5

Merge branch 'maint'
---

42df907d483d36f70e74ab340bd8ffa2319182e5