Merge branch 'maint'
commit2646271789d09ef39b354d0e91c4e2a980c71424
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Dec 2017 21:26:01 +0000 (15 22:26 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Dec 2017 21:26:01 +0000 (15 22:26 +0100)
treedac36213fde94ee3887cf75294d614f209d72d8e
parent5d4691dfbfea29cf2ecf8df8a97378082a573564
parent46124812d2f4b2bdadb6e41fbd07c98b8a7727d9
Merge branch 'maint'
lisp/ob-core.el
lisp/org-compat.el