From: nitroxis <nitroxis@wtwrp.de>
Date: Sat, 11 Jan 2014 21:31:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/divVerent/lhnet_tcp' into nitroxis/irc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3f4c14dcc5b70a0e1b4a9ed51d8ff9c4ec18f0c;p=xonotic%2Fdarkplaces.git

Merge remote-tracking branch 'origin/divVerent/lhnet_tcp' into nitroxis/irc
---

f3f4c14dcc5b70a0e1b4a9ed51d8ff9c4ec18f0c