Merge branch 'maint'
commitb30afa39b05501d31df463296cd807e7ecb0a679
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 27 Dec 2017 22:24:08 +0000 (27 23:24 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 27 Dec 2017 22:24:08 +0000 (27 23:24 +0100)
treea0fbd99c1c333a5262167f3e47b0c29bd177e36a
parent7b6ec64e0ea03d94db42fff7cb1dd4e5dbb2fa53
parentf2c712a6a4aefef1e6cca794e76dc757cd4786cb
Merge branch 'maint'
lisp/org.el