Merge branch 'maint'
commit88ffcf54d878f97332c2b9d7c05b3a159633212c
authorKyle Meyer <kyle@kyleam.com>
Thu, 7 Sep 2017 20:59:39 +0000 (7 16:59 -0400)
committerKyle Meyer <kyle@kyleam.com>
Thu, 7 Sep 2017 20:59:39 +0000 (7 16:59 -0400)
tree862b18ee23759b93f1bdf96acf21979e28f5ab70
parentbca91bb7ee089e7fe2d1048ce8706dff3be41366
parent79d9f0c0ce49cb852995b7093c20e5adff291806
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el