From: Mario <mario.mario@y7mail.com>
Date: Tue, 21 Feb 2017 10:29:00 +0000 (+1000)
Subject: Merge branch 'Mario/monsters'
X-Git-Tag: xonotic-v0.8.2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=242b19ae283951b330ab3a7fa3c1966658d1a5df;p=xonotic%2Fmediasource.git

Merge branch 'Mario/monsters'
---

242b19ae283951b330ab3a7fa3c1966658d1a5df