From: Mario <zacjardine@y7mail.com>
Date: Sun, 23 Aug 2015 10:43:54 +0000 (+0000)
Subject: Merge branch 'Mario/ons_updates' into 'master'
X-Git-Tag: xonotic-v0.8.2~2050
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=565b64117f10806899b4742ba69f8967c059ef78;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/ons_updates' into 'master'

Merge branch Mario/ons_updates (L merge request)

Greatly improves the onslaught gamemode

See merge request !195
---

565b64117f10806899b4742ba69f8967c059ef78