Merge branch 'maint'
commit966af419f98887673f37020ae5e05e5ce764006a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 15 Nov 2017 17:14:44 +0000 (15 18:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 15 Nov 2017 17:14:44 +0000 (15 18:14 +0100)
treefdbf01200b34ab1c6bc6d6f485e2e24687630932
parent64ac3bb5b39f5028ac89bda5c8ab1c344a1fee71
parent40f73953f661bec0e70d38d6e11f6d39c92504f8
Merge branch 'maint'
lisp/org-macs.el
testing/lisp/test-org-macs.el