From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 3 Jan 2014 14:53:21 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/trace-speedups
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FdivVerent%2Ftrace-speedups;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into divVerent/trace-speedups
---

0559a49b8b518909ea3088d94c9b49e7b43ae83d