From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Fri, 12 Jul 2013 13:12:01 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.1~17^2~61
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/0c233ae4e961d005aff02106242368b6f08b32ea

Merge branch 'maint'
---

0c233ae4e961d005aff02106242368b6f08b32ea