From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Wed, 28 Nov 2012 15:52:27 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~775
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/09cfdb8260af824a1ab85fa2fae2745441f1aa37

Merge branch 'maint'
---

09cfdb8260af824a1ab85fa2fae2745441f1aa37