Merge branch 'maint'
commit144451143a2ed727b775c4f78999bcdcdb0b82dc
authorMarco Wahl <marcowahlsoft@gmail.com>
Thu, 28 Dec 2017 18:15:43 +0000 (28 19:15 +0100)
committerMarco Wahl <marcowahlsoft@gmail.com>
Thu, 28 Dec 2017 18:15:43 +0000 (28 19:15 +0100)
treed55c7fb3516652e78cb1e09327f46b2fbbcdb6e8
parent6311c12556384e8faf24594a09f882a634dc7972
parente401afffde1891b1bf4b1d37dd074886c5c2a3f9
Merge branch 'maint'
lisp/org-inlinetask.el