Merge branch 'maint'
commitd39ccc17d4791f72eeaf8166f3cf98d245935f66
authorKyle Meyer <kyle@kyleam.com>
Sun, 9 Jul 2017 15:28:54 +0000 (9 11:28 -0400)
committerKyle Meyer <kyle@kyleam.com>
Sun, 9 Jul 2017 15:28:54 +0000 (9 11:28 -0400)
treebf205978e7855e44492e9a50053328a49163bb48
parentda99ee0fa6b36ae7e7cff8bf02730fe0ce5a9846
parentb7fdc3038873bb7037dfce3b4b14aa9e7ad16d99
Merge branch 'maint'
doc/org.texi
etc/ORG-NEWS
lisp/ob-sql.el
lisp/org-bbdb.el
lisp/org-bibtex.el
lisp/org-lint.el
lisp/org-table.el
lisp/org-timer.el
lisp/org.el
lisp/ox-html.el
lisp/ox-publish.el