Merge branch 'maint'
commit7b6ec64e0ea03d94db42fff7cb1dd4e5dbb2fa53
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Dec 2017 22:54:36 +0000 (25 23:54 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Dec 2017 22:54:36 +0000 (25 23:54 +0100)
treed5669ea100eb8a301ce9571b8b6f5fc7c05143e2
parentb9491c967c51d8b9b248cffa5439c9e605140bd4
parent85ed1fd01dee462b59bcd622b3d0dee739d0214b
Merge branch 'maint'
lisp/org.el