From: Mario <zacjardine@y7mail.com>
Date: Thu, 6 Oct 2016 12:49:45 +0000 (+0000)
Subject: Merge branch 'terencehill/overkill_stuff' into 'master'
X-Git-Tag: xonotic-v0.8.2~553
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07b3cfd52ba5681e8b85fdbc85cbea8e14c4ab4f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/overkill_stuff' into 'master'

Overkill stuff

It addresses issues reported in #1815. It closes #1815

See merge request !371
---

07b3cfd52ba5681e8b85fdbc85cbea8e14c4ab4f