Merge branch 'maint'master
commit87a6e3970a22eadd93d742925cab31d4d833ec30
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 26 Jun 2017 21:40:35 +0000 (26 23:40 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 26 Jun 2017 21:40:35 +0000 (26 23:40 +0200)
treec5f42064c7ca8c411c107899482b6c667924a21d
parent9389563356c8b6218c9731a009c46b3e2ea2ba8a
parent6c498f13375574db873d3d5da100235cfe09a190
Merge branch 'maint'
lisp/org.el