Merge branch 'maint'
commit55e8c6f9c3d19fe290f4f6102b57396ccc19581f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 28 Jan 2018 16:10:13 +0000 (28 17:10 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 28 Jan 2018 16:10:13 +0000 (28 17:10 +0100)
tree860dc44437f577d77e50432a12dfba17729cae8e
parent00dbb3089f034e88a443049d68fa458f6fa0ef93
parent5b4a711949eb3c757561b574b4d30af7c7e7cd79
Merge branch 'maint'
lisp/org.el