From: Mario <zacjardine@y7mail.com>
Date: Sat, 28 Jan 2017 11:36:05 +0000 (+0000)
Subject: Merge branch 'Mario/overkill' into 'master'
X-Git-Tag: xonotic-v0.8.2~266
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=0c46469c66df201aecb8bfd37fd089a242848097;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/overkill' into 'master'

Merge branch Mario/overkill (S merge request)

See merge request !407
---

0c46469c66df201aecb8bfd37fd089a242848097