From: Mario <zacjardine@y7mail.com>
Date: Sat, 18 Feb 2017 08:06:55 +0000 (+0000)
Subject: Merge branch 'Mario/bd_tweak' into 'master'
X-Git-Tag: xonotic-v0.8.2~200
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df01ffb2ceeacdcffc7ed259ffb65fd53d455ed4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/bd_tweak' into 'master'

Merge branch Mario/bd_tweak (M merge request)

See merge request !406
---

df01ffb2ceeacdcffc7ed259ffb65fd53d455ed4