Merge branch 'maint'
commit9e062df65dd8e26b8dde8dbabe9e9040c6f4c18b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Sep 2017 13:44:06 +0000 (14 15:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Sep 2017 13:44:06 +0000 (14 15:44 +0200)
tree738d787146e6c8ab2ed4c48d795486c82875f8b6
parent04498a4fbd9884cb1cd542f714a8bb4cad4f8585
parent25f12218d2fe1152cba840d1a0caedddb1656d90
Merge branch 'maint'
lisp/org.el