Merge branch 'maint'
commit27d0c469c0a58f9bc12d9f1c88c48dbc2d561bad
authorBastien <bzg@gnu.org>
Wed, 21 Mar 2018 00:58:25 +0000 (21 01:58 +0100)
committerBastien <bzg@gnu.org>
Wed, 21 Mar 2018 00:58:25 +0000 (21 01:58 +0100)
treea8bf64a6083fe98419a5041b364b02d75d606ffc
parenta402419716cd626696226c06e6cd9095d2e9f3d6
parente28a5a66ad87914a8c52ce8505859fc4ad83d505
Merge branch 'maint'
lisp/org.el