Merge branch 'maint'
commit9bee79a102fdb8887db0328f00cae1bb27c7fceb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 3 Nov 2017 22:11:07 +0000 (3 23:11 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 3 Nov 2017 22:11:07 +0000 (3 23:11 +0100)
treee20d7c6076b52df62ea13824fdb2f51ac0fd9da4
parent6a273e30d7921e835f7db41162f0654e409c679d
parent08c9de2a74082e693034ab2494df7de2931ea028
Merge branch 'maint'
lisp/org.el