Merge branch 'maint'
commit1171d5ef0c183721d961ddc3499739eb70bc53ed
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 16 Apr 2018 11:45:52 +0000 (16 13:45 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 16 Apr 2018 11:45:52 +0000 (16 13:45 +0200)
tree9e3d4279874f2db087cc2466c3701b3f340ece06
parentb4422add3745c26ec3b2e11b8da425844b2e9d3d
parent8b6a617ff53b5713f2e65bae58eb913672cac5c8
Merge branch 'maint'
lisp/org-inlinetask.el
lisp/org.el