Merge branch 'maint'
commit8184de6e1371bc9cc5f4d4efb4660621c1d18d0a
authorKyle Meyer <kyle@kyleam.com>
Fri, 13 Oct 2017 19:13:38 +0000 (13 15:13 -0400)
committerKyle Meyer <kyle@kyleam.com>
Fri, 13 Oct 2017 19:13:38 +0000 (13 15:13 -0400)
tree8418535015f2fe577524522e206cfe6938a3e9b7
parent86e6ab697c0a63cc21a8c1a6289f7832ea540cff
parent3f1d5f9091a76b9a3063ac3fe837727c07a3518f
Merge branch 'maint'
lisp/org-inlinetask.el