Merge branch 'maint'
commitd6729e3eda78b87968715ff53418c7be2f10fc11
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 20 Jan 2018 12:29:49 +0000 (20 13:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 20 Jan 2018 12:29:49 +0000 (20 13:29 +0100)
treef641359c41bf0c12442589eb7378b3efc4b11bc9
parentd378d9ec7ebf3a6f7b7b5e0ef7a264cd5815c022
parentc2576f349b7bf27ca00d42c91f5067584c241378
Merge branch 'maint'
lisp/org.el