Merge branch 'maint'
commit68544f4f21f329a0349884686c12ddbc09d2507b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Nov 2017 22:02:26 +0000 (27 23:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Nov 2017 22:02:26 +0000 (27 23:02 +0100)
tree444c5d9f1b844d9ca1737c4c30b534e94c2728a2
parent5cd7eb3d537866c40b16d9acbc1cf8233944905b
parent5873d9912145fb19d00cfa47587f8e16c59da56a
Merge branch 'maint'
lisp/org.el