Merge branch 'maint'
commit6311c12556384e8faf24594a09f882a634dc7972
authorMarco Wahl <marcowahlsoft@gmail.com>
Thu, 28 Dec 2017 17:05:54 +0000 (28 18:05 +0100)
committerMarco Wahl <marcowahlsoft@gmail.com>
Thu, 28 Dec 2017 17:05:54 +0000 (28 18:05 +0100)
treefd0b18275991d3cd1e11b0c9badd3c460ad360d2
parent269009d297c28cd47c037c72b446469bcc7c22da
parentb29a9723074343a54f99630f65285ab9694c3d78
Merge branch 'maint'
lisp/org-inlinetask.el