From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Sun, 3 Nov 2013 12:08:44 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: beta_8.3~776^2~97^2~1
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/1bf67e2903a62df05ad23d95d02f8d83517eb427

Merge branch 'maint'
---

1bf67e2903a62df05ad23d95d02f8d83517eb427