Merge branch 'maint'
commitcbbca2991b3758446a2fa0681f8d7536d071fb08
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Apr 2018 19:43:37 +0000 (11 21:43 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Apr 2018 19:43:37 +0000 (11 21:43 +0200)
tree6f2ca8197fbf90024967c2547103e76e3d11b544
parent36170429c3037522e927961c00614049af59fa76
parentb7a7dd1492af2853ead064e8b1cf3094216c2147
Merge branch 'maint'
lisp/org.el