From: Mario <zacjardine@y7mail.com>
Date: Tue, 14 Apr 2015 22:49:53 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_physics_prehax
X-Git-Tag: xonotic-v0.8.1~38^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=451382be257bcb485a1ada1872bfdf2f18769051;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/qc_physics_prehax
---

451382be257bcb485a1ada1872bfdf2f18769051