From: Mario <zacjardine@y7mail.com>
Date: Sat, 20 Aug 2016 13:24:01 +0000 (+0000)
Subject: Merge branch 'Mario/tweaks' into 'master'
X-Git-Tag: xonotic-v0.8.2~695
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8fd00088a08034de5a36427187ec269308dfbb4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/tweaks' into 'master'

Merge branch Mario/tweaks (M merge request)

Some extra mutator hooks for use in mods. Plus a few minor tweaks around the place...

See merge request !357
---

c8fd00088a08034de5a36427187ec269308dfbb4