Merge branch 'maint'
commitd7f2c8b8e1b4edb5456f6db805a79276059d9fbb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 25 Nov 2017 14:42:33 +0000 (25 15:42 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 25 Nov 2017 14:42:33 +0000 (25 15:42 +0100)
tree5aeb50f2615a23679e80493f21807fd3d105bf00
parentf67e62eb3f7bf1616c9c8e9db1c7e6ed2b475485
parented06b159c328d6b7781527725a49b8833ed18bfc
Merge branch 'maint'
lisp/org.el