Merge branch 'maint' of orgmode.org:org-mode into maint
commit2be2a15566782fad60d441582913a1f687b8b74d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 22 Jun 2016 20:36:22 +0000 (22 22:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 22 Jun 2016 20:36:22 +0000 (22 22:36 +0200)
treeafbcaafb4b57f7571e94d9e3b3bf8d1caf51b64a
parent85dd02b0ddab7299fb05c452ee95bd0cd0206503
parent792bb9b65504a70f3678409bba1a1c144b794a9d
Merge branch 'maint' of orgmode.org:org-mode into maint