From: Mario <mario@smbclan.net>
Date: Sun, 3 Jul 2016 23:14:52 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/Mario/tweaks'
X-Git-Tag: xonotic-v0.8.2~700^2~102
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f551090a70789701ca1f042746917295b3237bff;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/tweaks'
---

f551090a70789701ca1f042746917295b3237bff