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

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

Conflicts:
	.gitignore
---

5d007c88c604159ec55555d7726951ac1c0ea2cf