From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 13 Aug 2013 13:33:45 +0000 (+0200)
Subject: Merge branch 'divVerent/lhnet_tcp' into IDWMaster/lobby_and_chat_support
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=15d29a0315cc572869b1d32e2479321878408064;p=xonotic%2Fdarkplaces.git

Merge branch 'divVerent/lhnet_tcp' into IDWMaster/lobby_and_chat_support
---

15d29a0315cc572869b1d32e2479321878408064