Merge branch 'maint'
commit829ffa977c6f7030dbc837589fd3dec8b597a13f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Aug 2017 10:42:51 +0000 (10 12:42 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Aug 2017 10:42:51 +0000 (10 12:42 +0200)
treee6f99eef8139b3122bb6aad3f29c6cbab2dbfb69
parent8ab9a82be2a6178063e395a6ab3d2b9e083059c3
parentfebab2fedb93b8b589e91e6e733ffbd7e2937e7b
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el