From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 26 Nov 2014 10:43:59 +0000 (+0100)
Subject: Merge branch 'Mario/monsters'
X-Git-Tag: xonotic-v0.8.0~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f167a631c3356f9a44507874dfe04a0f1a35429e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mario/monsters'
---

f167a631c3356f9a44507874dfe04a0f1a35429e