From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Sat, 18 May 2013 16:26:56 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~208
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/63531fb2cc71993fb262970ee19ffea26a4f7ad4

Merge branch 'maint'
---

63531fb2cc71993fb262970ee19ffea26a4f7ad4