Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Sun, 20 Jul 2014 22:06:08 +0000 (00:06 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 20 Jul 2014 22:06:08 +0000 (00:06 +0200)
commitfe8a4ddb381ee282b2ddd674d0674802b2bf9f6b
tree941be149f486010806109b95243e78b0730ef3f0
parentfc3df376babe61fd8b725fb8c48c189eaebeec50
parentd7b26aa669ffd90cffda240f56b6dbe8e87ca4fa
Merge remote-tracking branch 'remotes/IOMultiplexer/v2'

Conflicts:
src/IOHandler/IOSockets.c