From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 2 Feb 2015 09:02:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimeP... 
X-Git-Tag: xonotic-v0.8.1~38^2~37^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e85c153239969d8dccea38031e18ddb24b6c935;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimePath/experiments/csqc_prediction
---

4e85c153239969d8dccea38031e18ddb24b6c935