From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Sep 2013 17:09:20 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~19^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3105ef2594f338ab02b651ae2944af0f39888bd1;p=xonotic%2Fxonotic-maps.pk3dir.git

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

3105ef2594f338ab02b651ae2944af0f39888bd1