From: Brian Bosak <webadm@elcnet.servehttp.com>
Date: Sun, 15 Sep 2013 01:24:02 +0000 (-0500)
Subject: Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FIDWMaster%2Flobby_and_chat_support;p=xonotic%2Fdarkplaces.git

Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support
---

98805552332b072fff592edfef8c829b9fd5c734