From: Mario <zacjardine@y7mail.com>
Date: Tue, 16 Aug 2016 01:16:16 +0000 (+0000)
Subject: Merge branch 'martin-t/solidpenetration' into 'master'
X-Git-Tag: xonotic-v0.8.2~709
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e59a4bfedbf9254e2c548e013a36545ed9d43e2e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/solidpenetration' into 'master'

fix solidpenetration

fixes #1738

See merge request !351
---

e59a4bfedbf9254e2c548e013a36545ed9d43e2e