]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84c7b38 68cdc4b)
Merge branch 'erc-async-reconnect' into emacs-25
authorl3thal <kwhite@gnu.org>
Fri, 13 Nov 2015 21:37:26 +0000 (16:37 -0500)
committerl3thal <kwhite@gnu.org>
Fri, 13 Nov 2015 21:37:26 +0000 (16:37 -0500)

Trivial merge