From: Mario <mario@smbclan.net>
Date: Sat, 23 Jul 2016 16:59:32 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_physics_cleanup_v2
X-Git-Tag: xonotic-v0.8.2~700^2~39^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12354d764a576f55a290ba11d9f34ccf4e3930d0;p=xonotic%2Fxonotic-data.pk3dir.git

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

12354d764a576f55a290ba11d9f34ccf4e3930d0