Merge branch 'maint'
commitf18823b80a8b9269ba94165b1b7771bf7e519670
authorBastien <bzg@gnu.org>
Tue, 20 Mar 2018 13:58:40 +0000 (20 14:58 +0100)
committerBastien <bzg@gnu.org>
Tue, 20 Mar 2018 13:58:40 +0000 (20 14:58 +0100)
tree1e0c63f447df3d63aef2e28ebbd83802faf96885
parent8548dfa33f2ea00d92044374258d762a8e1ea9d1
parentb7f350f7ef9a1aa9437730ca7b330a0a07c4fe39
Merge branch 'maint'
lisp/org.el