From: Brian Bosak <webadm@elcnet.servehttp.com>
Date: Mon, 2 Sep 2013 03:39:33 +0000 (-0500)
Subject: Merge branch 'IDWMaster/lobby_and_chat_support' of git://de.git.xonotic.org/xonotic... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2106ff8dce2077cc3cb7a9ec08e3f8c51c238ab1;p=xonotic%2Fdarkplaces.git

Merge branch 'IDWMaster/lobby_and_chat_support' of git://de.git.xonotic.org/xonotic/darkplaces into IDWMaster/lobby_and_chat_support
---

2106ff8dce2077cc3cb7a9ec08e3f8c51c238ab1