Merge branch 'maint'
commit8b5b2cf49efc20991f9374784908856f3d57c6c2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 28 Aug 2017 07:15:54 +0000 (28 09:15 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 28 Aug 2017 07:15:54 +0000 (28 09:15 +0200)
treece4a33265b27f977a8d8c7fa6c44db6d73be23f7
parentd49eee088d4b14a3b1237ada89d6e2f88032f107
parentab65bc13d62359705c48a17b87a7149ec8e75804
Merge branch 'maint'
lisp/org.el