Merge branch 'maint'
commit0d3683f2cd5490f213b471385d76479f819e2f41
authorKyle Meyer <kyle@kyleam.com>
Fri, 6 Jan 2017 01:23:58 +0000 (5 20:23 -0500)
committerKyle Meyer <kyle@kyleam.com>
Fri, 6 Jan 2017 01:23:58 +0000 (5 20:23 -0500)
treea5e88236c834469cde71ea68bea993359889ab05
parentbb258a4f07b65657cc03b4727af6d7a76f6ba8dc
parent713f785017e908333caddd244fcc685745e78539
Merge branch 'maint'
21 files changed:
contrib/lisp/org-mac-link.el
doc/org.texi
etc/ORG-NEWS
lisp/ob-R.el
lisp/ob-clojure.el
lisp/ob-exp.el
lisp/ob-plantuml.el
lisp/ob-sql.el
lisp/ob-tangle.el
lisp/org-agenda.el
lisp/org-bibtex.el
lisp/org-capture.el
lisp/org-compat.el
lisp/org-element.el
lisp/org-list.el
lisp/org-mouse.el
lisp/org.el
lisp/ox-html.el
lisp/ox-icalendar.el
lisp/ox-latex.el
lisp/ox-odt.el