From: Mario <zacjardine@y7mail.com>
Date: Sun, 16 Nov 2014 00:20:36 +0000 (+1100)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~19^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F2%2Fhead;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Mario/monsters
---

5d8362f026816ab0e941d3755b2cbb3a580cd960