Merge branch 'maint'
commit634e12a31ec880ae59a15419aa2b1e01e22f392e
authorKyle Meyer <kyle@kyleam.com>
Mon, 11 Apr 2016 04:32:43 +0000 (11 00:32 -0400)
committerKyle Meyer <kyle@kyleam.com>
Mon, 11 Apr 2016 04:32:43 +0000 (11 00:32 -0400)
tree92151ba85abc1d4039543f29dc2f8399f07572e7
parent492d68c9369f228869644451042da8c035f8ebad
parentacfd4111939e44ad660316c4fda4d0f38364912f
Merge branch 'maint'
lisp/org.el
lisp/ox-icalendar.el