Merge branch 'maint'
commitd89e35ee50ccd74530f1499d99e00009dd6c57ed
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 3 Feb 2018 14:24:50 +0000 (3 15:24 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 3 Feb 2018 14:24:50 +0000 (3 15:24 +0100)
treeacb7030e0175aa1d02500364cdb161bf8a39d6f5
parent005ff5f5c27f1187df81a48db9f93b9e99e94d97
parent52c059a10d869b1812267c6afbd14ca229bf1635
Merge branch 'maint'
lisp/org-feed.el