From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 29 Aug 2015 12:24:32 +0000 (+0000)
Subject: Merge branch 'Mario/monsters_broken' into 'master'
X-Git-Tag: xonotic-v0.8.2~1997
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0038499106b104bded29cb497c1448b35eb12018;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/monsters_broken' into 'master'

Merge branch Mario/monsters_broken (L merge request)

Don't worry, it's not broken

See merge request !208
---

0038499106b104bded29cb497c1448b35eb12018