Merge branch 'maint'
commitf8db6e0295bf522683f06469068bbf21e9a9f514
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 4 Dec 2017 17:55:29 +0000 (4 18:55 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 4 Dec 2017 17:55:29 +0000 (4 18:55 +0100)
treeaafab0811a9de16cad49937e40a8e45f78320df6
parentada2f64b168c4fea99e43233f08eca08836c66dd
parentd3f7309cbdd0b27e0b496fb82464b5ec67651c7f
Merge branch 'maint'
lisp/org-irc.el