Conflicts:
authorpk910 <philipp@zoelle1.de>
Sun, 20 Jul 2014 22:08:57 +0000 (00:08 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 20 Jul 2014 22:08:57 +0000 (00:08 +0200)
commita247fce3a534fa7563621da450d1669f2582d24b
treecd2570ba88cd4e212b2e0466338d38faab8a9b98
parentfe8a4ddb381ee282b2ddd674d0674802b2bf9f6b
Conflicts:
src/IOHandler/IOSockets.c
src/IOHandler/IOSockets.c