From: l3thal <kwhite@gnu.org>
Date: Fri, 13 Nov 2015 21:37:26 +0000 (-0500)
Subject: Merge branch 'erc-async-reconnect' into emacs-25
X-Git-Tag: emacs-25.0.90~805
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51644c33d2e046b681646e2e07a636ba2fb234dc;p=emacs.git

Merge branch 'erc-async-reconnect' into emacs-25
---

51644c33d2e046b681646e2e07a636ba2fb234dc