From: pk910 <philipp@zoelle1.de>
Date: Tue, 15 Jul 2014 20:17:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=4486fcba97a3609cc1c4a06f0e572974a891936c;hp=4486fcba97a3609cc1c4a06f0e572974a891936c;p=NextIRCd.git

Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
---