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

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