Merge branch 'maint'
commit4925d5be7be9b82ff54e07b82a6d20bb27c15c6f
authorKyle Meyer <kyle@kyleam.com>
Sun, 15 May 2016 23:00:30 +0000 (15 19:00 -0400)
committerKyle Meyer <kyle@kyleam.com>
Sun, 15 May 2016 23:00:30 +0000 (15 19:00 -0400)
tree4728fcc87482e2db8afae430f6ef2374f7493ee7
parente4eebe97ecc737f4e94f81cca53222a4eb416772
parent19cf68da90d0afd74a4c38106eae5c135e146364
Merge branch 'maint'
24 files changed:
lisp/ob-R.el
lisp/ob-comint.el
lisp/ob-core.el
lisp/ob-exp.el
lisp/ob-gnuplot.el
lisp/ob-haskell.el
lisp/ob-latex.el
lisp/ob-python.el
lisp/ob-scheme.el
lisp/ob-shell.el
lisp/org-bibtex.el
lisp/org-clock.el
lisp/org-colview.el
lisp/org-compat.el
lisp/org-feed.el
lisp/org-gnus.el
lisp/org-info.el
lisp/org-macro.el
lisp/org-macs.el
lisp/org-pcomplete.el
lisp/org-protocol.el
lisp/org-table.el
lisp/org.el
lisp/ox-org.el