Merge branch 'maint'
commite9f30779dead9b680f1a1841b232be57f12647c9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 31 Dec 2017 14:49:55 +0000 (31 15:49 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 31 Dec 2017 14:49:55 +0000 (31 15:49 +0100)
tree73d6e845048ffe1ef83d5f42d33ff954bec14573
parent423b5b2f9486b4f7f66d1f9d8377230055062501
parentaf58a6dbf77e5c51c4211a4a62065fd8e2fb47ad
Merge branch 'maint'
lisp/ob-core.el
lisp/org-agenda.el
lisp/org-table.el
lisp/org.el