From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 14 Dec 2014 11:48:00 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/experiments/csqc_prediction
X-Git-Tag: xonotic-v0.8.1~38^2~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=47b33b5fc37228a800a34b506ac655c53ed323db;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
	qcsrc/server/cl_physics.qc
---

47b33b5fc37228a800a34b506ac655c53ed323db