Merge branch 'maint'
commite44524b3b2346743e17c8cfa3a7c6bf0ea44505f
authorKyle Meyer <kyle@kyleam.com>
Thu, 4 Feb 2016 04:37:26 +0000 (3 23:37 -0500)
committerKyle Meyer <kyle@kyleam.com>
Thu, 4 Feb 2016 04:37:26 +0000 (3 23:37 -0500)
treef752d0cf2e4907f71a695e6707d6cd579f6f4778
parentc8a3ab1e4c02ca3bbbfd2fd20dbb091b91f4c1bc
parentb347277ba0242ab75e9ffbd1245c7bef677d2565
Merge branch 'maint'
doc/org.texi
lisp/ob-C.el
lisp/ob-fortran.el
lisp/org-agenda.el
lisp/ox-html.el