Merge branch 'maint'
commit04e0532ef53b17c482fb81da2687fb403207eb55
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 15 Nov 2017 17:59:05 +0000 (15 18:59 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 15 Nov 2017 17:59:05 +0000 (15 18:59 +0100)
tree34ffa1a95457b53063266072b638234e55ad874c
parent966af419f98887673f37020ae5e05e5ce764006a
parent696ec60341b6f8190b92dae9a3cee940830a5f21
Merge branch 'maint'
lisp/org-macs.el