From: pk910 <philipp@zoelle1.de>
Date: Wed, 28 Jan 2015 01:20:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=2d694e116e0f9c5bf9f72c78d12892266cfa8288

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

Conflicts:
	configure.ac
---

2d694e116e0f9c5bf9f72c78d12892266cfa8288