From: pk910 <philipp@zoelle1.de>
Date: Sun, 20 Jul 2014 22:06:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=fe8a4ddb381ee282b2ddd674d0674802b2bf9f6b

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

Conflicts:
	src/IOHandler/IOSockets.c
---

fe8a4ddb381ee282b2ddd674d0674802b2bf9f6b