Merge branch 'maint'
commit44e3745c786cd2994c0ce930a28c6863dfd5af7b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 6 Oct 2017 17:35:25 +0000 (6 19:35 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 6 Oct 2017 17:35:25 +0000 (6 19:35 +0200)
tree7edcaa5e63df507d84c2753f12a66fec3918a3c5
parent9455c6910e513f84a318c292cdc7f4146d47119c
parentfb403ca34ee87118683d4f5a64f0caac0168d95c
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el